MAX-237 changes to query_classifier