Fixed a test
Fixed static bug. Avoid doing queryMatcher for CNAME if match already in results