Based on discussion with Marco/Pam and Policy Team, it was requested TargetType default for vFW  should be modified to VM for Dublin. This impact TCA enrichment and CL event published (https://wiki.onap.org/display/DW/VES+event+enrichment+for+DCAE+mS) 

As Policy switched to customquery for AAI lookup for vFW, the current CL event published from DCAE/TCA resulted in exception (prior to this change, namequery was being used and Policy was able to handle it).

Emails discussions attached.