diff --git a/s1tbx-op-insar/src/main/java/org/esa/s1tbx/insar/gpf/CoherenceOp.java b/s1tbx-op-insar/src/main/java/org/esa/s1tbx/insar/gpf/CoherenceOp.java
index a1fa8ddf95..647f8d3e99 100644
--- a/s1tbx-op-insar/src/main/java/org/esa/s1tbx/insar/gpf/CoherenceOp.java
+++ b/s1tbx-op-insar/src/main/java/org/esa/s1tbx/insar/gpf/CoherenceOp.java
@@ -253,7 +253,12 @@ private void checkUserInput() {
             }
 
             final String[] polarisationsInBandNames = OperatorUtils.getPolarisations(sourceProduct);
-            polarisations = InterferogramOp.getPolsSharedByMstSlv(sourceProduct, polarisationsInBandNames);
+            if (singleMaster){
+              polarisations = InterferogramOp.getPolsSharedByMstSlv(sourceProduct, polarisationsInBandNames);
+            }
+            else{
+              polarisations = polarisationsInBandNames;
+            }
 
             sourceImageWidth = sourceProduct.getSceneRasterWidth();
             sourceImageHeight = sourceProduct.getSceneRasterHeight();
@@ -292,13 +297,13 @@ private void metaMapPut(final String tag,
                             final Map<String, CplxContainer> map) throws Exception {
 
         for (String swath : subswaths) {
-            final String subswath = swath.isEmpty() ? "" : '_' + swath.toUpperCase();
+            final String subswath = swath.isEmpty() ? "" : swath.toUpperCase()+'_';
 
             for (String polarisation : polarisations) {
-                final String pol = polarisation.isEmpty() ? "" : '_' + polarisation.toUpperCase();
+                final String pol = polarisation.isEmpty() ? "" : polarisation.toUpperCase()+'_';
 
                 // map key: ORBIT NUMBER
-                String mapKey = root.getAttributeInt(AbstractMetadata.ABS_ORBIT) + subswath + pol;
+                String mapKey = pol + subswath + root.getAttributeInt(AbstractMetadata.ABS_ORBIT);
 
                 // metadata: construct classes and define bands
                 final String date = OperatorUtils.getAcquisitionDate(root);