fix filter ordering