diff --git a/etc/db/schema-template.sql b/etc/db/schema-template.sql
index 723473b..72f0155 100644
--- a/etc/db/schema-template.sql
+++ b/etc/db/schema-template.sql
@@ -1240,6 +1240,7 @@ CREATE VIEW _SURVEY__TEMPLATE_.raw_lines_summary_geometry AS
     rls.length,
     rls.azimuth,
     rls.remarks,
+    rls.ntbp,
     g.geometry
    FROM (_SURVEY__TEMPLATE_.raw_lines_summary rls
      JOIN g USING (sequence));
diff --git a/lib/www/client/source/src/views/Map.vue b/lib/www/client/source/src/views/Map.vue
index 83cca9d..f745aba 100644
--- a/lib/www/client/source/src/views/Map.vue
+++ b/lib/www/client/source/src/views/Map.vue
@@ -101,15 +101,25 @@ const layers = {
     onEachFeature (feature, layer) {
       const p = feature.properties;
 	  if (feature.geometry) {
+        
+        const ntbp = p.ntbp
+          ? " <b>(NTBP)</b>"
+          : "";
+          
+        const remarks = p.remarks
+          ? "<hr/>"+p.remarks
+          : "";
+          
 		const popup = feature.geometry.type == "Point"
-			? `Raw sequence ${feature.properties.sequence}<br/>Point <b>${feature.properties.line} / ${feature.properties.point}</b><br/>${feature.properties.objref}<br/>${feature.properties.tstamp}`
-			: `Raw sequence ${p.sequence}<br/>
+			? `Raw sequence ${feature.properties.sequence}${ntbp}<br/>Point <b>${feature.properties.line} / ${feature.properties.point}</b><br/>${feature.properties.objref}<br/>${feature.properties.tstamp}`
+			: `Raw sequence ${p.sequence}${ntbp}<br/>
 			Line <b>${p.line}</b><br/>
 			${p.num_points} points${p.missing_shots ? " <i>("+p.missing_shots+" missing)</i>" : ""}<br/>
 			${Math.round(p.length)} m ${p.azimuth.toFixed(1)}°<br/>
 			${p.duration}<br/>
-			<table><tr><td><b>${p.fsp}</b></td><td>@ ${ftstamp(p.ts0)}</td></tr><tr><td><b>${p.lsp}</b></td><td>@ ${ftstamp(p.ts1)}</td></tr></table>`;
+			<table><tr><td><b>${p.fsp}</b></td><td>@ ${ftstamp(p.ts0)}</td></tr><tr><td><b>${p.lsp}</b></td><td>@ ${ftstamp(p.ts1)}</td></tr></table>${remarks}`;
 		layer.bindTooltip(popup, {sticky: true});
+        
 	  }
     }
   }),
@@ -129,6 +139,11 @@ const layers = {
     },
     onEachFeature (feature, layer) {
       const p = feature.properties;
+          
+        const remarks = p.remarks
+          ? "<hr/>"+p.remarks
+          : "";
+
       const popup = feature.geometry.type == "Point"
         ? `Final sequence ${p.sequence}<br/>Point <b>${p.line} / ${p.point}</b><br/>${p.objref}<br/>${p.tstamp}`
         : `Final sequence ${p.sequence}<br/>
@@ -136,7 +151,7 @@ const layers = {
           ${p.num_points} points${p.missing_shots ? " <i>("+p.missing_shots+" missing)</i>" : ""}<br/>
           ${Math.round(p.length)} m ${p.azimuth.toFixed(1)}°<br/>
           ${p.duration}<br/>
-          <table><tr><td><b>${p.fsp}</b></td><td>@ ${ftstamp(p.ts0)}</td></tr><tr><td><b>${p.lsp}</b></td><td>@ ${ftstamp(p.ts1)}</td></tr></table>`;
+          <table><tr><td><b>${p.fsp}</b></td><td>@ ${ftstamp(p.ts0)}</td></tr><tr><td><b>${p.lsp}</b></td><td>@ ${ftstamp(p.ts1)}</td></tr></table>${remarks}`;
 //        : `Final sequence ${feature.properties.sequence}<br/>Line <b>${feature.properties.line}</b><br/>${feature.properties.num_points} points<br/>From ${feature.properties.ts0}<br/>until ${feature.properties.ts0}`;
       layer.bindTooltip(popup, {sticky: true});
     }