Taking account of query_lemma new property in Clotho Export
Using upper to recognize name
Fix for Query terms
Various fixes