Adding condition for reordering - Filament