update to the queries
query cleanup