bugfix in query parser