Fixed the queries.

It's alive! :D