Cleaned up query.