Add support for count(*) without alias in order by query