updated queries

still need to backfill for user_query