Query_gen added, his NER working