Cleaned up query parameters