Cleaned up query processing