new query parser added, (not completely tested)