Switch from bottom-up to top-down parsing. Implemented EqualityQuery and AndQuery