Added a couple of ORDER BYs