Added queryParser fix