Fixing the ordering once for all
Renaming the filter