Switched to changing the queries.