Fixed rest of the queries.