Removed sort by condition to agilice the queries