diff --git a/modules/behavior/hash.js b/modules/behavior/hash.js
index ccdeeb4bb..386e8716a 100644
--- a/modules/behavior/hash.js
+++ b/modules/behavior/hash.js
@@ -58,7 +58,7 @@ export function behaviorHash(context) {
             return context.hasEntity(id);
         });
         if (selected.length) {
-            var firstLabel = utilDisplayLabel(context.entity(selected[0]), context);
+            var firstLabel = utilDisplayLabel(context.entity(selected[0]), context.graph());
             if (selected.length > 1 ) {
                 contextual = t('title.labeled_and_more', {
                     labeled: firstLabel,
diff --git a/modules/util/util.js b/modules/util/util.js
index 5ee8be039..f10a39332 100644
--- a/modules/util/util.js
+++ b/modules/util/util.js
@@ -201,13 +201,13 @@ export function utilDisplayType(id) {
 }
 
 
-export function utilDisplayLabel(entity, context) {
+export function utilDisplayLabel(entity, graph) {
     var displayName = utilDisplayName(entity);
     if (displayName) {
         // use the display name if there is one
         return displayName;
     }
-    var preset = presetManager.match(entity, context.graph());
+    var preset = presetManager.match(entity, graph);
     if (preset && preset.name()) {
         // use the preset name if there is a match
         return preset.name();
diff --git a/modules/validations/almost_junction.js b/modules/validations/almost_junction.js
index 592492eb9..4e70b2b5a 100644
--- a/modules/validations/almost_junction.js
+++ b/modules/validations/almost_junction.js
@@ -56,13 +56,13 @@ export function validationAlmostJunction(context) {
           const entity1 = context.hasEntity(this.entityIds[0]);
           if (this.entityIds[0] === this.entityIds[2]) {
             return entity1 ? t('issues.almost_junction.self.message', {
-              feature: utilDisplayLabel(entity1, context)
+              feature: utilDisplayLabel(entity1, context.graph())
             }) : '';
           } else {
             const entity2 = context.hasEntity(this.entityIds[2]);
             return (entity1 && entity2) ? t('issues.almost_junction.message', {
-              feature: utilDisplayLabel(entity1, context),
-              feature2: utilDisplayLabel(entity2, context)
+              feature: utilDisplayLabel(entity1, context.graph()),
+              feature2: utilDisplayLabel(entity2, context.graph())
             }) : '';
           }
         },
diff --git a/modules/validations/close_nodes.js b/modules/validations/close_nodes.js
index 80eca894c..3f9af1079 100644
--- a/modules/validations/close_nodes.js
+++ b/modules/validations/close_nodes.js
@@ -169,8 +169,8 @@ export function validationCloseNodes(context) {
                             var entity = context.hasEntity(this.entityIds[0]),
                                 entity2 = context.hasEntity(this.entityIds[1]);
                             return (entity && entity2) ? t('issues.close_nodes.detached.message', {
-                                feature: utilDisplayLabel(entity, context),
-                                feature2: utilDisplayLabel(entity2, context)
+                                feature: utilDisplayLabel(entity, context.graph()),
+                                feature2: utilDisplayLabel(entity2, context.graph())
                             }) : '';
                         },
                         reference: showReference,
@@ -233,7 +233,7 @@ export function validationCloseNodes(context) {
                 severity: 'warning',
                 message: function(context) {
                     var entity = context.hasEntity(this.entityIds[0]);
-                    return entity ? t('issues.close_nodes.message', { way: utilDisplayLabel(entity, context) }) : '';
+                    return entity ? t('issues.close_nodes.message', { way: utilDisplayLabel(entity, context.graph()) }) : '';
                 },
                 reference: showReference,
                 entityIds: [way.id, node1.id, node2.id],
diff --git a/modules/validations/crossing_ways.js b/modules/validations/crossing_ways.js
index beb716bd3..496fa0de8 100644
--- a/modules/validations/crossing_ways.js
+++ b/modules/validations/crossing_ways.js
@@ -333,7 +333,7 @@ export function validationCrossingWays(context) {
             var type1 = way1Info.featureType;
             var type2 = way2Info.featureType;
             if (type1 === type2) {
-                return utilDisplayLabel(way1Info.way, context) > utilDisplayLabel(way2Info.way, context);
+                return utilDisplayLabel(way1Info.way, context.graph()) > utilDisplayLabel(way2Info.way, context.graph());
             } else if (type1 === 'waterway') {
                 return true;
             } else if (type2 === 'waterway') {
@@ -381,8 +381,8 @@ export function validationCrossingWays(context) {
                 var entity1 = context.hasEntity(this.entityIds[0]),
                     entity2 = context.hasEntity(this.entityIds[1]);
                 return (entity1 && entity2) ? t('issues.crossing_ways.message', {
-                    feature: utilDisplayLabel(entity1, context),
-                    feature2: utilDisplayLabel(entity2, context)
+                    feature: utilDisplayLabel(entity1, context.graph()),
+                    feature2: utilDisplayLabel(entity2, context.graph())
                 }) : '';
             },
             reference: showReference,
diff --git a/modules/validations/disconnected_way.js b/modules/validations/disconnected_way.js
index 4706417ba..b895ca5ae 100644
--- a/modules/validations/disconnected_way.js
+++ b/modules/validations/disconnected_way.js
@@ -25,7 +25,7 @@ export function validationDisconnectedWay() {
             message: function(context) {
                 if (this.entityIds.length === 1) {
                     var entity = context.hasEntity(this.entityIds[0]);
-                    return entity ? t('issues.disconnected_way.highway.message', { highway: utilDisplayLabel(entity, context) }) : '';
+                    return entity ? t('issues.disconnected_way.highway.message', { highway: utilDisplayLabel(entity, context.graph()) }) : '';
                 }
                 return t('issues.disconnected_way.routable.message.multiple', { count: this.entityIds.length.toString() });
             },
diff --git a/modules/validations/help_request.js b/modules/validations/help_request.js
index 701cfb69d..85d5cec32 100644
--- a/modules/validations/help_request.js
+++ b/modules/validations/help_request.js
@@ -25,7 +25,7 @@ export function validationHelpRequest(context) {
             severity: 'warning',
             message: function(context) {
                 var entity = context.hasEntity(this.entityIds[0]);
-                return entity ? t('issues.fixme_tag.message', { feature: utilDisplayLabel(entity, context) }) : '';
+                return entity ? t('issues.fixme_tag.message', { feature: utilDisplayLabel(entity, context.graph()) }) : '';
             },
             dynamicFixes: function() {
                 return [
diff --git a/modules/validations/impossible_oneway.js b/modules/validations/impossible_oneway.js
index c9e6488f0..66443757a 100644
--- a/modules/validations/impossible_oneway.js
+++ b/modules/validations/impossible_oneway.js
@@ -164,7 +164,7 @@ export function validationImpossibleOneway() {
                 message: function(context) {
                     var entity = context.hasEntity(this.entityIds[0]);
                     return entity ? t('issues.impossible_oneway.' + messageID + '.message', {
-                        feature: utilDisplayLabel(entity, context)
+                        feature: utilDisplayLabel(entity, context.graph())
                     }) : '';
                 },
                 reference: getReference(referenceID),
diff --git a/modules/validations/incompatible_source.js b/modules/validations/incompatible_source.js
index a6acfa271..1314dd4bb 100644
--- a/modules/validations/incompatible_source.js
+++ b/modules/validations/incompatible_source.js
@@ -35,7 +35,7 @@ export function validationIncompatibleSource() {
                 message: function(context) {
                     var entity = context.hasEntity(this.entityIds[0]);
                     return entity ? t('issues.incompatible_source.' + invalidSource.id + '.feature.message', {
-                        feature: utilDisplayLabel(entity, context)
+                        feature: utilDisplayLabel(entity, context.graph())
                     }) : '';
                 },
                 reference: getReference(invalidSource.id),
diff --git a/modules/validations/invalid_format.js b/modules/validations/invalid_format.js
index e80c88f97..dccf9bede 100644
--- a/modules/validations/invalid_format.js
+++ b/modules/validations/invalid_format.js
@@ -56,7 +56,7 @@ export function validationFormatting() {
                     message: function(context) {
                         var entity = context.hasEntity(this.entityIds[0]);
                         return entity ? t('issues.invalid_format.website.message' + this.data,
-                            { feature: utilDisplayLabel(entity, context), site: websites.join(', ') }) : '';
+                            { feature: utilDisplayLabel(entity, context.graph()), site: websites.join(', ') }) : '';
                     },
                     reference: showReferenceWebsite,
                     entityIds: [entity.id],
@@ -81,7 +81,7 @@ export function validationFormatting() {
                     message: function(context) {
                         var entity = context.hasEntity(this.entityIds[0]);
                         return entity ? t('issues.invalid_format.email.message' + this.data,
-                            { feature: utilDisplayLabel(entity, context), email: emails.join(', ') }) : '';
+                            { feature: utilDisplayLabel(entity, context.graph()), email: emails.join(', ') }) : '';
                     },
                     reference: showReferenceEmail,
                     entityIds: [entity.id],
diff --git a/modules/validations/mismatched_geometry.js b/modules/validations/mismatched_geometry.js
index d53d241dd..c079ff05d 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('issues.tag_suggests_area.message', {
-                    feature: utilDisplayLabel(entity, context),
+                    feature: utilDisplayLabel(entity, context.graph()),
                     tag: utilTagText({ tags: tagSuggestingArea })
                 }) : '';
             },
@@ -161,7 +161,7 @@ export function validationMismatchedGeometry() {
                 message: function(context) {
                     var entity = context.hasEntity(this.entityIds[0]);
                     return entity ? t('issues.vertex_as_point.message', {
-                        feature: utilDisplayLabel(entity, context)
+                        feature: utilDisplayLabel(entity, context.graph())
                     }) : '';
                 },
                 reference: function showReference(selection) {
@@ -184,7 +184,7 @@ export function validationMismatchedGeometry() {
                 message: function(context) {
                     var entity = context.hasEntity(this.entityIds[0]);
                     return entity ? t('issues.point_as_vertex.message', {
-                        feature: utilDisplayLabel(entity, context)
+                        feature: utilDisplayLabel(entity, context.graph())
                     }) : '';
                 },
                 reference: function showReference(selection) {
@@ -260,7 +260,7 @@ export function validationMismatchedGeometry() {
                 message: function(context) {
                     var entity = context.hasEntity(this.entityIds[0]);
                     return entity ? t('issues.unclosed_multipolygon_part.message', {
-                        feature: utilDisplayLabel(entity, context)
+                        feature: utilDisplayLabel(entity, context.graph())
                     }) : '';
                 },
                 reference: showReference,
diff --git a/modules/validations/missing_role.js b/modules/validations/missing_role.js
index 3c9c39fee..95bf2143f 100644
--- a/modules/validations/missing_role.js
+++ b/modules/validations/missing_role.js
@@ -45,8 +45,8 @@ export function validationMissingRole() {
                 var member = context.hasEntity(this.entityIds[1]),
                     relation = context.hasEntity(this.entityIds[0]);
                 return (member && relation) ? t('issues.missing_role.message', {
-                    member: utilDisplayLabel(member, context),
-                    relation: utilDisplayLabel(relation, context)
+                    member: utilDisplayLabel(member, context.graph()),
+                    relation: utilDisplayLabel(relation, context.graph())
                 }) : '';
             },
             reference: showReference,
diff --git a/modules/validations/missing_tag.js b/modules/validations/missing_tag.js
index f56b3c6ac..efc7610b0 100644
--- a/modules/validations/missing_tag.js
+++ b/modules/validations/missing_tag.js
@@ -85,7 +85,7 @@ export function validationMissingTag(context) {
             message: function(context) {
                 var entity = context.hasEntity(this.entityIds[0]);
                 return entity ? t('issues.' + messageID + '.message', {
-                    feature: utilDisplayLabel(entity, context)
+                    feature: utilDisplayLabel(entity, context.graph())
                 }) : '';
             },
             reference: showReference,
diff --git a/modules/validations/outdated_tags.js b/modules/validations/outdated_tags.js
index 76d022660..c162d17d8 100644
--- a/modules/validations/outdated_tags.js
+++ b/modules/validations/outdated_tags.js
@@ -215,7 +215,7 @@ export function validationOutdatedTags() {
       if (subtype === 'noncanonical_brand' && isOnlyAddingTags) {
         messageID += '_incomplete';
       }
-      return t(messageID, { feature: utilDisplayLabel(currEntity, context) });
+      return t(messageID, { feature: utilDisplayLabel(currEntity, context.graph()) });
     }
 
 
@@ -302,7 +302,7 @@ export function validationOutdatedTags() {
       if (!currMultipolygon) return '';
 
       return t('issues.old_multipolygon.message',
-          { multipolygon: utilDisplayLabel(currMultipolygon, context) }
+          { multipolygon: utilDisplayLabel(currMultipolygon, context.graph()) }
       );
     }
 
diff --git a/modules/validations/private_data.js b/modules/validations/private_data.js
index 5ff49314e..db9a788d0 100644
--- a/modules/validations/private_data.js
+++ b/modules/validations/private_data.js
@@ -99,7 +99,7 @@ export function validationPrivateData() {
             if (!currEntity) return '';
 
             return t('issues.private_data.contact.message',
-                { feature: utilDisplayLabel(currEntity, context) }
+                { feature: utilDisplayLabel(currEntity, context.graph()) }
             );
         }
 
diff --git a/modules/validations/unsquare_way.js b/modules/validations/unsquare_way.js
index 270c87488..6b608243c 100644
--- a/modules/validations/unsquare_way.js
+++ b/modules/validations/unsquare_way.js
@@ -76,7 +76,7 @@ export function validationUnsquareWay(context) {
             severity: 'warning',
             message: function(context) {
                 var entity = context.hasEntity(this.entityIds[0]);
-                return entity ? t('issues.unsquare_way.message', { feature: utilDisplayLabel(entity, context) }) : '';
+                return entity ? t('issues.unsquare_way.message', { feature: utilDisplayLabel(entity, context.graph()) }) : '';
             },
             reference: showReference,
             entityIds: [entity.id],