Fixed ordering of queries so they actually work :P