Fixing queries.