Fixed lots of bugs

Refactor the Search to support under(FILTER).

Extract a NodeQueryMatcher that is used to match the core query as well as the subquery inside the under() clause.