Reworked AnalyzingQuerqyParser to produce less objects