diff --git a/package-lock.json b/package-lock.json
index 835037e1..2bf67a1c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "21.4.11",
+  "version": "21.4.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "21.4.11",
+      "version": "21.4.12",
       "license": "MIT",
       "dependencies": {
         "@cdransf/api-text": "^1.4.0",
diff --git a/package.json b/package.json
index ffaa106c..a3c1c093 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "21.4.11",
+  "version": "21.4.12",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "scripts": {
diff --git a/src/data/music.js b/src/data/music.js
index e53fb56d..d8809ea7 100644
--- a/src/data/music.js
+++ b/src/data/music.js
@@ -101,7 +101,6 @@ export default async function () {
   }
 
   const selectFields = `
-    id,
     listened_at,
     track_name,
     artist_name,
diff --git a/src/pages/dynamic/music/artists/artist.html b/src/pages/dynamic/music/artists/artist.html
index 2dcd4c6f..46c0a4b7 100644
--- a/src/pages/dynamic/music/artists/artist.html
+++ b/src/pages/dynamic/music/artists/artist.html
@@ -70,7 +70,23 @@ schema: artist
     </p>
     <ul>
       {% for concert in artist.concerts %}
-        <li>On <strong class="highlight-text">{{ concert.date | date: "%B %e, %Y" }}</strong> at <a href="https://www.openstreetmap.org/?mlat={{ concert.venue_latitude }}&mlon={{ concert.venue_longitude }}#map=18/{{ concert.venue_latitude }}/{{ concert.venue_longitude }}">{{ concert.venue | formatVenue }}</a></li>
+        {%- capture venue -%}
+          {% if concert.venue %}
+            {% if concert.venue_latitude and concert.venue_longitude %}
+              <a href="https://www.openstreetmap.org/?mlat={{ concert.venue_latitude }}&mlon={{ concert.venue_longitude }}#map=18/{{ concert.venue_latitude }}/{{ concert.venue_longitude }}">{{ concert.venue | formatVenue }}</a>
+            {% else %}
+              {{ concert.venue | formatVenue }}
+            {% endif %}
+          {% endif %}
+        {%- endcapture -%}
+        <li>
+          On <strong class="highlight-text">{{ concert.date | date: "%B %e, %Y" }}</strong>
+          {% if venue %} at {{ venue }}{% endif %}
+          {%- if concert.concert_notes -%}
+            {% assign notes = concert.concert_notes | prepend: "### Notes\n" | markdown %}
+            {% render "partials/blocks/modal.liquid", label:"Concert info", icon:"info-circle", content:notes, id:concert.id %}
+          {%- endif -%}
+        </li>
       {% endfor %}
     </ul>
     <hr />
diff --git a/src/pages/dynamic/music/concerts.html b/src/pages/dynamic/music/concerts.html
index b5ad204c..31df48d5 100644
--- a/src/pages/dynamic/music/concerts.html
+++ b/src/pages/dynamic/music/concerts.html
@@ -7,13 +7,13 @@ pagination:
   size: 30
 permalink: "/music/concerts/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html"
 ---
-{% if pagination.pageNumber == 0 %}
+{%- if pagination.pageNumber == 0 -%}
 <h2 class="page-header">Concerts</h2>
 <p>These are concerts I've attended (not all of them — just the ones I could remember or glean from emails, photo metadata et al). I've been to at least <strong class="highlight-text">{{ concerts | size }}</strong> shows. <a href="/music">You can also take a look at the music I've been listening to lately</a>.</p>
 <hr />
-{% endif %}
+{%- endif -%}
 <ul class="concert-list">
-  {% for concert in pagination.items %}
+  {%- for concert in pagination.items -%}
     {%- capture artistName -%}
       {% if concert.artistNameString %}
         {{ concert.artistNameString }}
@@ -33,11 +33,11 @@ permalink: "/music/concerts/{% if pagination.pageNumber > 0 %}{{ pagination.page
     <li>
       {{ artistName }} on <strong class="highlight-text">{{ concert.date | date: "%B %e, %Y" }}</strong>
       {% if venue %} at {{ venue }}{% endif %}
-      {% if concert.notes %}
+      {%- if concert.notes -%}
         {% assign notes = concert.notes | prepend: "### Notes\n" | markdown %}
         {% render "partials/blocks/modal.liquid", label:"Concert info", icon:"info-circle", content:notes, id:concert.id %}
-      {% endif %}
+      {%- endif -%}
     </li>
-  {% endfor %}
+  {%- endfor -%}
 </ul>
 {% render "partials/nav/paginator.liquid", pagination:pagination %}
\ No newline at end of file