[validate_query] handle null and empty query string queries
Merge pull request #2094 from spenceralger/implement_personal_preferences_for_2093

Personal preferences regarding #2093