Cleaned up queries.