diff --git a/modules/util/util.js b/modules/util/util.js
index 38fbf3803..a36a4dee1 100644
--- a/modules/util/util.js
+++ b/modules/util/util.js
@@ -216,13 +216,15 @@ export function utilDisplayType(id) {
 }
 
 
-export function utilDisplayLabel(entity, graph) {
+export function utilDisplayLabel(entity, graphOrGeometry) {
     var displayName = utilDisplayName(entity);
     if (displayName) {
         // use the display name if there is one
         return displayName;
     }
-    var preset = presetManager.match(entity, graph);
+    var preset = typeof graphOrGeometry === 'string' ?
+        presetManager.matchTags(entity.tags, graphOrGeometry) :
+        presetManager.match(entity, graphOrGeometry);
     if (preset && preset.name()) {
         // use the preset name if there is a match
         return preset.name();
diff --git a/modules/validations/mismatched_geometry.js b/modules/validations/mismatched_geometry.js
index 0619135f2..d2945d602 100644
--- a/modules/validations/mismatched_geometry.js
+++ b/modules/validations/mismatched_geometry.js
@@ -88,7 +88,7 @@ export function validationMismatchedGeometry() {
             message: function(context) {
                 var entity = context.hasEntity(this.entityIds[0]);
                 return entity ? t.html('issues.tag_suggests_area.message', {
-                    feature: utilDisplayLabel(entity, context.graph()),
+                    feature: utilDisplayLabel(entity, 'area'),
                     tag: utilTagText({ tags: tagSuggestingArea })
                 }) : '';
             },
@@ -161,7 +161,7 @@ export function validationMismatchedGeometry() {
                 message: function(context) {
                     var entity = context.hasEntity(this.entityIds[0]);
                     return entity ? t.html('issues.vertex_as_point.message', {
-                        feature: utilDisplayLabel(entity, context.graph())
+                        feature: utilDisplayLabel(entity, 'vertex')
                     }) : '';
                 },
                 reference: function showReference(selection) {
@@ -184,7 +184,7 @@ export function validationMismatchedGeometry() {
                 message: function(context) {
                     var entity = context.hasEntity(this.entityIds[0]);
                     return entity ? t.html('issues.point_as_vertex.message', {
-                        feature: utilDisplayLabel(entity, context.graph())
+                        feature: utilDisplayLabel(entity, 'point')
                     }) : '';
                 },
                 reference: function showReference(selection) {