further rationalize string query syntax