Matcher is better for Queries - still working on it.