diff --git a/data-discovery/src/main/java/vlkb/output/XmlSerializer.java b/data-discovery/src/main/java/vlkb/output/XmlSerializer.java
index 2300f276ef6d833085ac91ad2709d514f13da799..5a2013d53d46e78e680c8472bd6136e0e7fa312d 100644
--- a/data-discovery/src/main/java/vlkb/output/XmlSerializer.java
+++ b/data-discovery/src/main/java/vlkb/output/XmlSerializer.java
@@ -373,10 +373,10 @@ final class XmlSerializer
          xml.append("<URL type=\"file\">" + access.accessFileUrl + "</URL>");
 
       if(access.accessCutoutUrl != null)
-         xml.append("<URL type=\"cutout\">" + access.accessCutoutUrl + "</URL>");
+         xml.append("<URL type=\"cutout\">" + access.accessCutoutUrl.replaceAll("&","&amp;") + "</URL>");
 
       if(access.accessMosaicUrl != null)
-         xml.append("<URL type=\"mosaic\">" + access.accessMosaicUrl + "</URL>");
+         xml.append("<URL type=\"mosaic\">" + access.accessMosaicUrl.replaceAll("&","&amp;") + "</URL>");
 
       xml.append("</Access>");
 
diff --git a/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java b/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
index d35e0914059b3ad2d92cba0e7ce7d7421b82463a..89912a0adb551054238710d08c29aa1f07944082 100644
--- a/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
+++ b/data-discovery/src/main/java/vlkb/webapi/FormatResponseFilter.java
@@ -389,11 +389,11 @@ public class FormatResponseFilter implements Filter
 
       if(coord.band != null)
       {
-         sb.append("&amp;" + coord.band.toString());
-         //sb.append("&amp;BANDSYS=" + coord.band.system.toString() );
+         sb.append("&" + coord.band.toString());
+         //sb.append("&BANDSYS=" + coord.band.system.toString() );
       }
 
-      sb.append("&amp;ID="); // FIXME id-value will be added in FormatResponseFilter
+      sb.append("&ID="); // FIXME id-value will be added in FormatResponseFilter
 
       return sb.toString();
    }