Created first version of QueryAnnotator
Fixed conflict
fixed QueryConcept problem