Move sort methods from helper

* To Filter::Query