Add (true) query to grammar and unit tests for it