dropping rake, turning voice_query_stop robust