Cleaned up query objects