Fixed count to be 666 again, and a emberassing query parsing bug