Updating queries to pull numbers