replace ordering filters by input filters
Merge branch 'dev'