Added some query ordering