From 2dd0279db71f5d0b79e5b3c5af68c8eb46747bf8 Mon Sep 17 00:00:00 2001
From: Tiffany Meyer <tiffanym@ucar.edu>
Date: Tue, 21 Jun 2022 14:48:39 -0400
Subject: [PATCH] Updating RadarMapMouseHandler (nexrad display radar
 selection) and associated radar bundles to try all reflectivity and velocity
 product numbers and changing the individual radar bundle files to use the
 constraint "IN" instead of "EQUALS".

Originally these files only included product ID's #94 (Z) and #99 (V) but when NOAAPort removed these lower resolution level3 products and replaced them with the higher resolution (#153 - Z and #154 - V) level3 files no data was able to load. I changed it so it would try all Z/V product codes and load the highest resolution for what is available.
---
 .../localization/bundles/site/Radar_eeri.xml                  | 4 ++--
 .../localization/bundles/site/Radar_fqkw.xml                  | 4 ++--
 .../localization/bundles/site/Radar_fqwa.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kabr.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kabx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kakq.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kama.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kamx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kapx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_karx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_katx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kbbx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kbgm.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kbhx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kbis.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kbix.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kblx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kbmx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kbox.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kbro.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kbuf.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kbyx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kcae.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kcbw.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kcbx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kccx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kcle.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kclx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kcri.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kcrp.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kcxx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kcys.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kdax.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kddc.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kdfx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kdgx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kdix.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kdlh.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kdmx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kdox.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kdtx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kdvn.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kdyx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_keax.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kemx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kenx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_keox.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kepz.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kesx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kevx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kewx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_keyx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kfcx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kfdr.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kfdx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kffc.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kfsd.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kfsx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kftg.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kfws.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kggw.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kgjx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kgld.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kgrb.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kgrk.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kgrr.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kgsp.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kgwx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kgyx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_khdx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_khgx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_khnx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_khpx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_khtx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kict.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kicx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kiln.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kilx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kind.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kinx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kiwa.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kiwx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kjax.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kjgx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kjkl.xml                  | 4 ++--
 .../localization/bundles/site/Radar_klbb.xml                  | 4 ++--
 .../localization/bundles/site/Radar_klch.xml                  | 4 ++--
 .../localization/bundles/site/Radar_klgx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_klix.xml                  | 4 ++--
 .../localization/bundles/site/Radar_klnx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_klot.xml                  | 4 ++--
 .../localization/bundles/site/Radar_klrx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_klsx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kltx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_klvx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_klwx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_klzk.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmaf.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmax.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmbx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmhx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmkx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmlb.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmob.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmpx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmqt.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmrx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmsx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmtx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmux.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmvx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kmxx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_knkx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_knqa.xml                  | 4 ++--
 .../localization/bundles/site/Radar_koax.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kohx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kokx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kotx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kpah.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kpbz.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kpdt.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kpoe.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kpux.xml                  | 4 ++--
 .../localization/bundles/site/Radar_krax.xml                  | 4 ++--
 .../localization/bundles/site/Radar_krgx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kriw.xml                  | 4 ++--
 .../localization/bundles/site/Radar_krlx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_krtx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_ksfx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_ksgf.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kshv.xml                  | 4 ++--
 .../localization/bundles/site/Radar_ksjt.xml                  | 4 ++--
 .../localization/bundles/site/Radar_ksox.xml                  | 4 ++--
 .../localization/bundles/site/Radar_ksrx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_ktbw.xml                  | 4 ++--
 .../localization/bundles/site/Radar_ktfx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_ktlh.xml                  | 4 ++--
 .../localization/bundles/site/Radar_ktlx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_ktwx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_ktyx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kudx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kuex.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kvax.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kvbx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kvnx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kvtx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kvwx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_kyux.xml                  | 4 ++--
 .../localization/bundles/site/Radar_lpla.xml                  | 4 ++--
 .../localization/bundles/site/Radar_pabc.xml                  | 4 ++--
 .../localization/bundles/site/Radar_pacg.xml                  | 4 ++--
 .../localization/bundles/site/Radar_paec.xml                  | 4 ++--
 .../localization/bundles/site/Radar_pahg.xml                  | 4 ++--
 .../localization/bundles/site/Radar_paih.xml                  | 4 ++--
 .../localization/bundles/site/Radar_pakc.xml                  | 4 ++--
 .../localization/bundles/site/Radar_papd.xml                  | 4 ++--
 .../localization/bundles/site/Radar_pgua.xml                  | 4 ++--
 .../localization/bundles/site/Radar_phki.xml                  | 4 ++--
 .../localization/bundles/site/Radar_phkm.xml                  | 4 ++--
 .../localization/bundles/site/Radar_phmo.xml                  | 4 ++--
 .../localization/bundles/site/Radar_phwa.xml                  | 4 ++--
 .../localization/bundles/site/Radar_rkjk.xml                  | 4 ++--
 .../localization/bundles/site/Radar_rksg.xml                  | 4 ++--
 .../localization/bundles/site/Radar_rodn.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tadw.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tatl.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tbna.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tbos.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tbwi.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tclt.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tcmh.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tcvg.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tdal.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tday.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tdca.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tden.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tdfw.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tdtw.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tewr.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tfll.xml                  | 4 ++--
 .../localization/bundles/site/Radar_thou.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tiad.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tiah.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tich.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tids.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tjfk.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tjua.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tlas.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tlve.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tmci.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tmco.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tmdw.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tmem.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tmia.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tmke.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tmsp.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tmsy.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tokc.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tord.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tpbi.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tphl.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tphx.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tpit.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tpsf.xml                  | 4 ++--
 .../localization/bundles/site/Radar_trdu.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tsdf.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tsju.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tslc.xml                  | 4 ++--
 .../localization/bundles/site/Radar_tstl.xml                  | 4 ++--
 .../localization/bundles/site/Radar_ttpa.xml                  | 4 ++--
 .../localization/bundles/site/Radar_ttul.xml                  | 4 ++--
 .../com/raytheon/viz/radar/rsc/map/RadarMapMouseHandler.java  | 4 ++--
 212 files changed, 424 insertions(+), 424 deletions(-)

diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_eeri.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_eeri.xml
index b67ff5d389..f7f7ad22b5 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_eeri.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_eeri.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="eeri"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="eeri"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_fqkw.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_fqkw.xml
index fb4d6efd6a..eff83d5296 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_fqkw.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_fqkw.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="fqkw"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="fqkw"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_fqwa.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_fqwa.xml
index 6684300b39..4bdbf66a88 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_fqwa.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_fqwa.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="fqwa"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="fqwa"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kabr.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kabr.xml
index a300226c63..dd40db8e1f 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kabr.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kabr.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kabr"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kabr"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kabx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kabx.xml
index f9b8a04613..f4cb289b81 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kabx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kabx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kabx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kabx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kakq.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kakq.xml
index dab103d304..813f93dad6 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kakq.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kakq.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kakq"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kakq"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kama.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kama.xml
index 36518b4c71..5c81f69c15 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kama.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kama.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kama"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kama"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kamx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kamx.xml
index d3cc637179..fcbea80371 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kamx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kamx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kamx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kamx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kapx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kapx.xml
index d0b4f234b8..1f18b9a59d 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kapx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kapx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kapx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kapx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_karx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_karx.xml
index 8eb2d44c5a..de2fe96655 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_karx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_karx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="karx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="karx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_katx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_katx.xml
index ca04c0f697..18ba4f16ea 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_katx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_katx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="katx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="katx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbbx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbbx.xml
index 133e1e474b..a4780f9bfd 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbbx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbbx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbbx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbbx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbgm.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbgm.xml
index b2e0bc9ab0..d2a1e5c98b 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbgm.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbgm.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbgm"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbgm"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbhx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbhx.xml
index 99fb29057f..c24ac3b20e 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbhx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbhx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbhx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbhx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbis.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbis.xml
index fcb17faa5e..bf6a9a807c 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbis.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbis.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbis"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbis"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbix.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbix.xml
index 60250dfc6f..d8dfbbd926 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbix.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbix.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbix"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbix"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kblx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kblx.xml
index a9fa50e9da..4b5063aef9 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kblx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kblx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kblx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kblx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbmx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbmx.xml
index 56f29b7869..ef690fec23 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbmx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbmx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbmx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbmx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbox.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbox.xml
index bdaf0af143..03b99a1151 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbox.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbox.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbox"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbox"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbro.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbro.xml
index 2912998a0e..c6737636b6 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbro.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbro.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbro"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbro"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbuf.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbuf.xml
index 8494851235..f752b27dc0 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbuf.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbuf.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbuf"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbuf"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbyx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbyx.xml
index 4a748fb991..0c4b4b505d 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbyx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kbyx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbyx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kbyx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcae.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcae.xml
index 012956a7a7..a2043db721 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcae.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcae.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcae"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcae"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcbw.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcbw.xml
index 177987072f..a0e5e7dbcf 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcbw.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcbw.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcbw"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcbw"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcbx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcbx.xml
index 9d08bb3dd7..41122382b8 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcbx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcbx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcbx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcbx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kccx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kccx.xml
index 568d0828ce..8cd57dc949 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kccx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kccx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kccx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kccx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcle.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcle.xml
index 62f2fe122c..877b3495a0 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcle.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcle.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcle"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcle"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kclx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kclx.xml
index dd989daffa..954dd5b583 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kclx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kclx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kclx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kclx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcri.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcri.xml
index 689606150d..fb20c52ccd 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcri.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcri.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcri"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcri"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcrp.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcrp.xml
index b6ec4331e5..1dd4a7566c 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcrp.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcrp.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcrp"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcrp"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcxx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcxx.xml
index 04eef40186..e83aae53a6 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcxx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcxx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcxx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcxx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcys.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcys.xml
index 24b3df8c91..874d34309c 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcys.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kcys.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcys"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kcys"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdax.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdax.xml
index 30a57ebec5..18f9d54c46 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdax.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdax.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdax"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdax"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kddc.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kddc.xml
index 88a081c3f3..cebc10ebae 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kddc.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kddc.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kddc"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kddc"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdfx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdfx.xml
index d02ca787d0..53cd153925 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdfx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdfx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdfx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdfx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdgx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdgx.xml
index 0398ec71ae..59066bdf21 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdgx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdgx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdgx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdgx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdix.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdix.xml
index f304ddbe0f..254d153984 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdix.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdix.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdix"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdix"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdlh.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdlh.xml
index 5db552eccf..08cf5be83a 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdlh.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdlh.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdlh"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdlh"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdmx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdmx.xml
index 2bf2f87482..7215c2b10a 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdmx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdmx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdmx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdmx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdox.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdox.xml
index 18c49750b3..d16ae8f821 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdox.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdox.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdox"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdox"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdtx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdtx.xml
index 3264f3d659..160861e166 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdtx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdtx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdtx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdtx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdvn.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdvn.xml
index 4c9266e043..c50ce4b531 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdvn.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdvn.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdvn"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdvn"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdyx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdyx.xml
index 80ab0f14d3..be22de9cab 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdyx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kdyx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdyx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kdyx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keax.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keax.xml
index de5f4a3577..56ae1b4bff 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keax.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keax.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="keax"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="keax"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kemx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kemx.xml
index 8c5b0b9513..7731be810e 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kemx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kemx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kemx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kemx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kenx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kenx.xml
index 63942fb2db..0055009133 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kenx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kenx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kenx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kenx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keox.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keox.xml
index 0cd0f8edeb..37f8c86734 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keox.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keox.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="keox"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="keox"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kepz.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kepz.xml
index 87d480401b..f9f2c46aa1 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kepz.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kepz.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kepz"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kepz"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kesx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kesx.xml
index 8310f5ccd4..035e17bd2c 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kesx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kesx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kesx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kesx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kevx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kevx.xml
index 050fa88237..56925e7bc4 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kevx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kevx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kevx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kevx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kewx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kewx.xml
index 161d641eea..1c46e154b8 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kewx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kewx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kewx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kewx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keyx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keyx.xml
index c2ff22e7a0..9298b502f3 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keyx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_keyx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="keyx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="keyx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfcx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfcx.xml
index ffda7065be..f38f18b41a 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfcx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfcx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfcx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfcx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfdr.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfdr.xml
index 3e1c45e248..dd5d859337 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfdr.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfdr.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfdr"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfdr"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfdx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfdx.xml
index f44a93f54b..7cfac41398 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfdx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfdx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfdx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfdx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kffc.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kffc.xml
index 8e975853d5..4fecc49c89 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kffc.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kffc.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kffc"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kffc"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfsd.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfsd.xml
index 0f7b2320e6..bf37a8726f 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfsd.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfsd.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfsd"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfsd"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfsx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfsx.xml
index 98329004cf..43af2b3513 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfsx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfsx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfsx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfsx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kftg.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kftg.xml
index 5de7f08349..4df52a943c 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kftg.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kftg.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kftg"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kftg"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfws.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfws.xml
index b1cff6b080..79796a11b7 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfws.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kfws.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfws"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kfws"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kggw.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kggw.xml
index 21b722fbb2..21717cab51 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kggw.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kggw.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kggw"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kggw"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgjx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgjx.xml
index 54a2489ad5..1dab4380b4 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgjx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgjx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgjx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgjx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgld.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgld.xml
index 47e503c119..64c3681a88 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgld.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgld.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgld"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgld"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrb.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrb.xml
index 2f6e52913e..39b866a808 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrb.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrb.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgrb"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgrb"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrk.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrk.xml
index 3dd349d3fd..ad99e74b43 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrk.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrk.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgrk"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgrk"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrr.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrr.xml
index a755ce2e4b..61518cc73a 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrr.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgrr.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgrr"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgrr"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgsp.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgsp.xml
index 23db11297c..42763c2a4b 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgsp.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgsp.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgsp"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgsp"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgwx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgwx.xml
index a3a6f656cb..7b40815e68 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgwx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgwx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgwx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgwx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgyx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgyx.xml
index b5ed4deda5..3ce3bcf0a1 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgyx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kgyx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgyx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kgyx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khdx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khdx.xml
index 749a50448c..9a7c170470 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khdx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khdx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khdx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khdx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khgx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khgx.xml
index 17eb70d559..832ee103ce 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khgx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khgx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khgx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khgx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khnx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khnx.xml
index 1b414e68bf..8f8affe707 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khnx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khnx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khnx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khnx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khpx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khpx.xml
index d2d82ebc22..9abd594628 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khpx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khpx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khpx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khpx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khtx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khtx.xml
index 8950c65dcc..e5cc278747 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khtx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_khtx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khtx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="khtx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kict.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kict.xml
index baf10de8fb..e8653a61c0 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kict.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kict.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kict"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kict"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kicx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kicx.xml
index 9c9449d03d..c93b48005e 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kicx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kicx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kicx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kicx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiln.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiln.xml
index 579f600bab..c0dc8387a6 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiln.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiln.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kiln"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kiln"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kilx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kilx.xml
index 6be7c9ec34..1a7ed92526 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kilx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kilx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kilx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kilx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kind.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kind.xml
index d5c791acc2..3b2ec7d6ee 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kind.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kind.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kind"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kind"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kinx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kinx.xml
index c0bcfc15c9..0ab07b52a6 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kinx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kinx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kinx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kinx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiwa.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiwa.xml
index f61431feae..f4eb776ee4 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiwa.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiwa.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kiwa"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kiwa"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiwx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiwx.xml
index 671025156a..bba2982137 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiwx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kiwx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kiwx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kiwx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjax.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjax.xml
index 1a928e6263..441e8502d9 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjax.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjax.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kjax"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kjax"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjgx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjgx.xml
index 36a1c8f933..b358334df7 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjgx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjgx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kjgx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kjgx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjkl.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjkl.xml
index 9ed453f1d9..fd6fd74e4c 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjkl.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kjkl.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kjkl"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kjkl"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klbb.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klbb.xml
index b3a417b60c..d02f1049ce 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klbb.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klbb.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klbb"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klbb"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klch.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klch.xml
index e0d0ffbd19..04147d668e 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klch.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klch.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klch"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klch"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klgx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klgx.xml
index be1ba6a4ee..746041d14d 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klgx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klgx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klgx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klgx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klix.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klix.xml
index c65e52338e..82a07d435e 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klix.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klix.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klix"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klix"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klnx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klnx.xml
index 88c6edf76f..d8e8465420 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klnx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klnx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klnx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klnx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klot.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klot.xml
index df06504fb3..3a53718988 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klot.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klot.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klot"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klot"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klrx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klrx.xml
index 77a2043bd9..13c853eddb 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klrx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klrx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klrx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klrx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klsx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klsx.xml
index aa00897dd5..62c4f25bfe 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klsx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klsx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klsx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klsx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kltx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kltx.xml
index 692e0d21ac..52af8f80e0 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kltx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kltx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kltx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kltx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klvx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klvx.xml
index 86db49dbcb..bab96e378a 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klvx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klvx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klvx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klvx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klwx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klwx.xml
index a8e4b53f2e..734e5108f0 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klwx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klwx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klwx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klwx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klzk.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klzk.xml
index 4f1f8190f9..cb8c4afca5 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klzk.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_klzk.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klzk"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="klzk"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmaf.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmaf.xml
index cdc292308c..49453cf4bd 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmaf.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmaf.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmaf"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmaf"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmax.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmax.xml
index ad44fa7f3b..bf2600f7f7 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmax.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmax.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmax"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmax"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmbx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmbx.xml
index 4b0ea1e708..e57beb26d8 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmbx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmbx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmbx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmbx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmhx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmhx.xml
index e295da85b5..302044ee5e 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmhx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmhx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmhx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmhx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmkx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmkx.xml
index 4c336c1122..b0462c5eb7 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmkx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmkx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmkx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmkx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmlb.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmlb.xml
index 5c2214fd0f..7201766a8a 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmlb.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmlb.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmlb"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmlb"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmob.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmob.xml
index 588532dc77..d2bdd63287 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmob.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmob.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmob"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmob"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmpx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmpx.xml
index f214c38c51..aca47c9d89 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmpx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmpx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmpx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmpx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmqt.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmqt.xml
index f68fbc2fc6..4a01b4acf8 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmqt.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmqt.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmqt"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmqt"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmrx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmrx.xml
index 4531337507..de172532e9 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmrx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmrx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmrx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmrx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmsx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmsx.xml
index d357756891..7c6b1b87b5 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmsx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmsx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmsx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmsx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmtx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmtx.xml
index b6d94b8bff..76b8538a1b 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmtx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmtx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmtx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmtx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmux.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmux.xml
index 5dd82f5486..751ee3ea7b 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmux.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmux.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmux"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmux"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmvx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmvx.xml
index 563126686a..18f36c216f 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmvx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmvx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmvx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmvx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmxx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmxx.xml
index 4803727723..612744bda9 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmxx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kmxx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmxx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kmxx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_knkx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_knkx.xml
index 30bf8c8965..8bdf6ae5c8 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_knkx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_knkx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="knkx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="knkx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_knqa.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_knqa.xml
index f855b13a87..9347a141a4 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_knqa.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_knqa.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="knqa"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="knqa"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_koax.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_koax.xml
index 14b5c1c48d..8831baf9c6 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_koax.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_koax.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="koax"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="koax"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kohx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kohx.xml
index 87e474461d..a565336f14 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kohx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kohx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kohx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kohx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kokx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kokx.xml
index 8d749c3dfe..020eab32e9 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kokx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kokx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kokx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kokx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kotx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kotx.xml
index c9f33a47b6..190851ba38 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kotx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kotx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kotx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kotx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpah.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpah.xml
index e4df2438dc..3c5ce7ac8c 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpah.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpah.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kpah"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kpah"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpbz.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpbz.xml
index 2e40b9b0d0..43560433da 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpbz.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpbz.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kpbz"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kpbz"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpdt.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpdt.xml
index 4c08a16dae..e19742c94c 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpdt.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpdt.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kpdt"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kpdt"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpoe.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpoe.xml
index b93ae8da28..dc27982db6 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpoe.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpoe.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kpoe"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kpoe"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpux.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpux.xml
index d1b0fc3cf0..66e9306c34 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpux.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kpux.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kpux"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kpux"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krax.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krax.xml
index 7d8f5000ae..b135277a47 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krax.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krax.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="krax"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="krax"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krgx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krgx.xml
index 9c236d9217..4409c21f4c 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krgx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krgx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="krgx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="krgx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kriw.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kriw.xml
index 95fc92c709..1f139f9b79 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kriw.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kriw.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kriw"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kriw"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krlx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krlx.xml
index 8ef7dd6b8f..cba92ce867 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krlx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krlx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="krlx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="krlx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krtx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krtx.xml
index f6068105bc..489834ed7b 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krtx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_krtx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="krtx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="krtx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksfx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksfx.xml
index 5272d9ed0e..5452dde9d2 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksfx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksfx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ksfx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ksfx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksgf.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksgf.xml
index fc3e1dbf91..7d43e4879f 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksgf.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksgf.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ksgf"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ksgf"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kshv.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kshv.xml
index ee2a5d6ab6..47a47da9a1 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kshv.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kshv.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kshv"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kshv"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksjt.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksjt.xml
index 5c794c7d5c..9c0b148d26 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksjt.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksjt.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ksjt"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ksjt"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksox.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksox.xml
index 5062dd02aa..ed6a723aa2 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksox.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksox.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ksox"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ksox"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksrx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksrx.xml
index 778e1a653e..24c426518d 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksrx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ksrx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ksrx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ksrx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktbw.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktbw.xml
index def960f7bf..10e773005f 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktbw.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktbw.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ktbw"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ktbw"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktfx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktfx.xml
index c8bb6cddf8..a8ee83c44b 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktfx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktfx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ktfx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ktfx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktlh.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktlh.xml
index eed0b116c4..c355d35be6 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktlh.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktlh.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ktlh"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ktlh"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktlx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktlx.xml
index b8b5922ff2..4f34877099 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktlx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktlx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ktlx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ktlx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktwx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktwx.xml
index a5a01fe10d..1665157422 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktwx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktwx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ktwx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ktwx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktyx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktyx.xml
index e6a1a2bac8..e2e079e7e9 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktyx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ktyx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ktyx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ktyx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kudx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kudx.xml
index 0f1dda7aee..0c279c42a9 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kudx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kudx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kudx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kudx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kuex.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kuex.xml
index 1b2bc57a70..c2e2372d76 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kuex.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kuex.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kuex"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kuex"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvax.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvax.xml
index eca5dfe0b8..6369053425 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvax.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvax.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kvax"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kvax"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvbx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvbx.xml
index 42b0c0804b..68c77a0adb 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvbx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvbx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kvbx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kvbx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvnx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvnx.xml
index a980dd219f..4e72eb2af8 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvnx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvnx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kvnx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kvnx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvtx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvtx.xml
index c771686852..1fbb551be2 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvtx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvtx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kvtx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kvtx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvwx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvwx.xml
index 481dbd8377..1fe7b655e4 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvwx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kvwx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kvwx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kvwx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kyux.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kyux.xml
index 302eb3961f..c85d81c51d 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kyux.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_kyux.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kyux"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="kyux"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_lpla.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_lpla.xml
index 4e4b49f398..0ebf84bdb6 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_lpla.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_lpla.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="lpla"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="lpla"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pabc.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pabc.xml
index 89292cde1f..d788cc5d80 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pabc.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pabc.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="pabc"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="pabc"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pacg.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pacg.xml
index 461ab41787..3609f106ce 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pacg.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pacg.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="pacg"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="pacg"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_paec.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_paec.xml
index 50cd8452d2..d0fe59db1d 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_paec.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_paec.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="paec"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="paec"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pahg.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pahg.xml
index a7b8c7cc8a..73e3f2a9f4 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pahg.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pahg.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="pahg"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="pahg"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_paih.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_paih.xml
index e23be4fdcd..e3aa0f7db0 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_paih.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_paih.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="paih"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="paih"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pakc.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pakc.xml
index b206a9c752..3bf9561563 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pakc.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pakc.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="pakc"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="pakc"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_papd.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_papd.xml
index 5a5320d83f..836b45a38f 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_papd.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_papd.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="papd"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="papd"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pgua.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pgua.xml
index 3deeb3896c..4fa09d929a 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pgua.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_pgua.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="pgua"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="pgua"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phki.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phki.xml
index 8ec6b306c8..95a27b9b44 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phki.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phki.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="phki"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="phki"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phkm.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phkm.xml
index 4b9acbb5fa..cd9b745dbf 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phkm.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phkm.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="phkm"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="phkm"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phmo.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phmo.xml
index 1c2648f27a..31a48e730c 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phmo.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phmo.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="phmo"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="phmo"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phwa.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phwa.xml
index 78fc41b21d..1ec1d4c9a2 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phwa.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_phwa.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="phwa"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="phwa"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_rkjk.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_rkjk.xml
index 25d05d033e..181bbe9585 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_rkjk.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_rkjk.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="rkjk"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="rkjk"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_rksg.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_rksg.xml
index ca1a9e797a..be54db53aa 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_rksg.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_rksg.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="rksg"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="rksg"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_rodn.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_rodn.xml
index db91756d99..f1c79703c4 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_rodn.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_rodn.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="rodn"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="rodn"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tadw.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tadw.xml
index dcb30dd17d..5e03f31c8d 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tadw.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tadw.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tadw"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tadw"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tatl.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tatl.xml
index 4936098bdf..7857e4acd2 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tatl.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tatl.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tatl"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tatl"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tbna.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tbna.xml
index 9588e18730..c345117fbd 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tbna.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tbna.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tbna"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tbna"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tbos.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tbos.xml
index 5c86284497..37ca11e52f 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tbos.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tbos.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tbos"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tbos"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tbwi.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tbwi.xml
index 5af84f94d1..49af15aaa4 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tbwi.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tbwi.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tbwi"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tbwi"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tclt.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tclt.xml
index d753dcb2e1..2aebc24047 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tclt.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tclt.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tclt"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tclt"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tcmh.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tcmh.xml
index fd4ff4091d..09b8ec5cc4 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tcmh.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tcmh.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tcmh"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tcmh"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tcvg.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tcvg.xml
index 5df8c296d1..3d7f0af238 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tcvg.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tcvg.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tcvg"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tcvg"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdal.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdal.xml
index 4588573d69..45b70baaee 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdal.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdal.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tdal"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tdal"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tday.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tday.xml
index 40893234ae..ef03a2f067 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tday.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tday.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tday"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tday"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdca.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdca.xml
index 76e3336c8a..55dc1fd8d3 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdca.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdca.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tdca"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tdca"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tden.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tden.xml
index 2b864ddf47..a044475767 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tden.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tden.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tden"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tden"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdfw.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdfw.xml
index c0b0e6ee99..068a2e7509 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdfw.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdfw.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tdfw"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tdfw"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdtw.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdtw.xml
index b322fff94e..4831a2e54d 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdtw.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tdtw.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tdtw"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tdtw"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tewr.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tewr.xml
index 148ecc1de6..867d2792f2 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tewr.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tewr.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tewr"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tewr"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tfll.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tfll.xml
index abf3e0e6de..b33e9f5802 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tfll.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tfll.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tfll"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tfll"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_thou.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_thou.xml
index fca995ceac..03fd80ab4d 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_thou.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_thou.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="thou"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="thou"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tiad.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tiad.xml
index 4eb97559b4..a7981960c1 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tiad.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tiad.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tiad"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tiad"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tiah.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tiah.xml
index 5f4cf0fc73..ff5f63e159 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tiah.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tiah.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tiah"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tiah"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tich.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tich.xml
index bc4c74d8fd..b7d89a64f5 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tich.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tich.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tich"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tich"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tids.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tids.xml
index ffdc8ebafd..54bbf4a86d 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tids.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tids.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tids"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tids"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tjfk.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tjfk.xml
index af88678aaf..07b01af8fc 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tjfk.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tjfk.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tjfk"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tjfk"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tjua.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tjua.xml
index ccde035590..a8da06c842 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tjua.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tjua.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tjua"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tjua"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tlas.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tlas.xml
index 39c7631f73..050ec9e230 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tlas.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tlas.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tlas"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tlas"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tlve.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tlve.xml
index 4925a643e8..5a3cc143a5 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tlve.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tlve.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tlve"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tlve"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmci.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmci.xml
index cca25a6201..4bc8506cf5 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmci.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmci.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmci"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmci"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmco.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmco.xml
index b93c52eec9..7c75627f8a 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmco.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmco.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmco"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmco"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmdw.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmdw.xml
index aaa4e7451e..3647cd5882 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmdw.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmdw.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmdw"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmdw"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmem.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmem.xml
index ee244c2989..5e9c9154b9 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmem.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmem.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmem"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmem"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmia.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmia.xml
index 6ad3ea1e4d..eada61930f 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmia.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmia.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmia"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmia"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmke.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmke.xml
index 3857d840d3..49ad7c7b70 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmke.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmke.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmke"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmke"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmsp.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmsp.xml
index d31da1b7ce..c91c231ab8 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmsp.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmsp.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmsp"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmsp"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmsy.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmsy.xml
index 1b61604cbd..a4282043d8 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmsy.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tmsy.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmsy"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tmsy"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tokc.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tokc.xml
index a752427df2..924949f7f2 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tokc.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tokc.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tokc"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tokc"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tord.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tord.xml
index 37916c0350..998db5aba9 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tord.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tord.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tord"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tord"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tpbi.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tpbi.xml
index ec7946e25e..d66f39e0be 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tpbi.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tpbi.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tpbi"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tpbi"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tphl.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tphl.xml
index 13b79872a9..160de931e4 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tphl.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tphl.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tphl"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tphl"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tphx.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tphx.xml
index fd9e7f5d85..4276f2fc1a 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tphx.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tphx.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tphx"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tphx"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tpit.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tpit.xml
index 7110a7e368..624b2797a1 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tpit.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tpit.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tpit"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tpit"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tpsf.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tpsf.xml
index a61c708f36..650e2ebb46 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tpsf.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tpsf.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tpsf"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tpsf"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_trdu.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_trdu.xml
index df4a938de6..5454691f5f 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_trdu.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_trdu.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="trdu"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="trdu"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tsdf.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tsdf.xml
index b106016ab3..61ff06e33b 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tsdf.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tsdf.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tsdf"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tsdf"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tsju.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tsju.xml
index bd25e26fa6..1dd605ab0c 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tsju.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tsju.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tsju"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tsju"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tslc.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tslc.xml
index 672becda51..33ae524d1c 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tslc.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tslc.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tslc"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tslc"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tstl.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tstl.xml
index b05a22eae4..30b0f479cf 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tstl.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_tstl.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tstl"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="tstl"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ttpa.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ttpa.xml
index 9a600c9a40..cad96e47a0 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ttpa.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ttpa.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ttpa"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ttpa"/>
diff --git a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ttul.xml b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ttul.xml
index f7f85b19aa..0601ebd6ce 100644
--- a/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ttul.xml
+++ b/cave/com.raytheon.viz.radar/localization/bundles/site/Radar_ttul.xml
@@ -21,7 +21,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product1}"/>
+                                        <constraint constraintType="IN" constraintValue="${product1}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ttul"/>
@@ -161,7 +161,7 @@
                             <resourceData xsi:type="radarResourceData" pointID="" mode="" latest="false" rangeRings="true" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
                                 <metadataMap>
                                     <mapping key="productCode">
-                                        <constraint constraintType="EQUALS" constraintValue="${product2}"/>
+                                        <constraint constraintType="IN" constraintValue="${product2}"/>
                                     </mapping>
                                     <mapping key="icao">
                                         <constraint constraintType="EQUALS" constraintValue="ttul"/>
diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/map/RadarMapMouseHandler.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/map/RadarMapMouseHandler.java
index 452416c8eb..90643a01bc 100644
--- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/map/RadarMapMouseHandler.java
+++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/map/RadarMapMouseHandler.java
@@ -155,8 +155,8 @@ public class RadarMapMouseHandler extends InputAdapter {
 	                        
 	                        Map<String, String> variableSubstitutions = new HashMap<>();
 	                        // TODO: dynamically select this from some control
-	                        variableSubstitutions.put("product1", "94");
-	                        variableSubstitutions.put("product2", "99");
+	                        variableSubstitutions.put("product1", "153,94,19,20");
+	                        variableSubstitutions.put("product2", "154");
 	                        
 	                        new LoadBundleHandler("bundles/site/Radar_" + pt.getName().toLowerCase() + ".xml", 
 	                        		variableSubstitutions, null, true).execute(null);