Pulled out lots of query troubles