Quick fix to the queries.