Add orderby on main query