Change order of filter removal to avoid changing order by parameters
Possible fix to #104