quite a few bug fixes from adding the new query
syntax qa test.