Add support for multiple "order by" inside the same query