diff --git a/assets/js/data-explorer/data.js b/assets/js/data-explorer/data.js
index 6445d91cf34..623e84449f9 100644
--- a/assets/js/data-explorer/data.js
+++ b/assets/js/data-explorer/data.js
@@ -1029,7 +1029,8 @@ function draw311Buttons(indicator_id) {
             for (let i = 0; i < filteredCrosswalk.length; i ++ ) {
                 let title = filteredCrosswalk[i].topic
                 let destination = filteredCrosswalk[i].kaLink
-                let btn = `<a href="https://portal.311.nyc.gov/article/?kanumber=${destination}" class="mr-1" target="_blank" rel="noopener noreferrer">${title}</a>| `
+                let divider = i < filteredCrosswalk.length - 1 ? '| ' : ''
+                let btn = `<a href="https://portal.311.nyc.gov/article/?kanumber=${destination}" class="mr-1" target="_blank" rel="noopener noreferrer">${title}</a>${divider}`
                 dest.forEach(element => element.innerHTML += btn)
             }
     })
diff --git a/themes/dohmh/layouts/partials/keywords.html b/themes/dohmh/layouts/partials/keywords.html
index 25da6dd4d34..77cd15d2025 100644
--- a/themes/dohmh/layouts/partials/keywords.html
+++ b/themes/dohmh/layouts/partials/keywords.html
@@ -2,7 +2,7 @@
 {{- if .Params.keywords -}}
 <h5 class="font-weight-bold keywords fs-sm">Keywords:</h5>
     <div class="fs-xs">
-        {{- range .Params.keywords -}}<a class="" href="{{ "keywords/" | relLangURL }}{{ . | urlize }}/">{{ . }}</a> |&#32;
+        {{- range $i, $kw := .Params.keywords -}}{{- if $i }} | {{ end -}}<a class="" href="{{ "keywords/" | relLangURL }}{{ $kw | urlize }}/">{{ $kw }}</a>
         {{- end -}}
     </div>