Amended enrichment queries