query_handler updated