Fixed a lot of the over querying