XDS Query: Work on enrichment, added test.
Moved resource lookup to Util.