Refactored queries.