Passes 226 (+2)  Failures 119 (-2)

Fixes syntax-query/manifest#test_35a syntax-query/manifest#test_36a