Change method order to match filters