Fixed a few queries.