diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2affccf4..c4b2b485b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ or learn more by visiting our project page on GitHub:  :octocat: https://github.
 
 If you love iD, please star our project on GitHub to show your support! :star:
 
-_Breaking changes, which may affect downstream projects or sites that embed iD, are marked with a_ :warning:
+_Breaking developer changes, which may affect downstream projects or sites that embed iD, are marked with a_ :warning:
 
 <!--
 # A.B.C
@@ -118,6 +118,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 
 #### :white_check_mark: Validation
 * Offer to upgrade `capacity` to `seats` on `amenity=bench` ([#8002], [#7886], thanks [@mikenath223])
+* Don't offer tag upgrades that would overwrite existing data ([#7843])
 * Improve feature labels in mismatched geometry warnings ([#8018])
 * Offer to fix the order of values in `vending=parcel_mail_in;parcel_pickup` ([#7988])
 * Offer to upgrade `barrier=chicane` to `barrier=cycle_barrier` ([#8045])
@@ -128,6 +129,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 
 [@mikenath223]: https://github.com/mikenath223
 
+[#7843]: https://github.com/openstreetmap/iD/issues/7843
 [#8002]: https://github.com/openstreetmap/iD/issues/8002
 [#7886]: https://github.com/openstreetmap/iD/issues/7886
 [#8018]: https://github.com/openstreetmap/iD/issues/8018
@@ -274,7 +276,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 * Add `increment` property to numeric field data to set the amount the stepper should add and subtract ([#7867])
 * Add `usage` property to field data to indicate how iD uses each field
 * Remove unused `direction_cardinal` field and its translations ([#8096])
-* Rename functions that now accept HTML instead of plaintext: `uiFlash.text` to `uiFlash.label`, `uiDisclosure.title` to `uiDisclosure.label`, `uiSection.title` to `uiSection.label`, `uiPane.title` to `uiPane.label`
+* :warning: Rename functions that now accept HTML instead of plaintext: `uiFlash.text` to `uiFlash.label`, `uiDisclosure.title` to `uiDisclosure.label`, `uiSection.title` to `uiSection.label`, `uiPane.title` to `uiPane.label`
 
 [@peternewman]: https://github.com/peternewman
 
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 08e343adc..7c9535d70 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -11304,8 +11304,8 @@
                 "description": "Mappers and OpenStreetMap enthusiasts in the Twin Cities area",
                 "extendedDescription": "Connecting OpenStreetMap enthusiasts in Minnesota and the Twin Cities!"
             },
-            "Mapping-DC-meetup": {
-                "name": "Mapping DC",
+            "MappingDC-meetup": {
+                "name": "MappingDC",
                 "description": "Improve OpenStreetMap in the DC area",
                 "extendedDescription": "We are a group of volunteer mappers who aim to improve the OpenStreetMap in the DC area. We also aim to teach others about the OSM ecosystem, data analytics, cartography, and GIS. We gather every other month at meetups to focus on one area of our city."
             },
@@ -11454,10 +11454,6 @@
                 "name": "OSM Cuba on Telegram",
                 "description": "OpenStreetMap Cuba Telegram chat"
             },
-            "OSM-CZ-telegram": {
-                "name": "OpenStreetMap CZ Telegram",
-                "description": "A Telegram group for the OSM Czech community: {url}"
-            },
             "OSM-Central-Salish-Sea": {
                 "name": "OpenStreetMap Central Salish Sea",
                 "description": "Mappers and OpenStreetMap users around Mount Vernon, WA",
@@ -11553,7 +11549,7 @@
             },
             "OSM-MY-matrix": {
                 "name": "OpenStreetMap Malaysia Riot channel",
-                "description": "All mappers are welcome! Sign up at {signupUrl}"
+                "description": "All mappers are welcome! Sign up at {url}"
             },
             "OSM-Nepal-facebook": {
                 "name": "OpenStreetMap Nepal",
@@ -11612,6 +11608,10 @@
                 "name": "OpenStreetMap Poland Forum",
                 "description": "Forum of Polish OpenStreetMap community"
             },
+            "OSM-PL-github": {
+                "name": "OpenStreetMap Polska on GitHub",
+                "description": "GitHub organization for Polish OpenStreetMap community"
+            },
             "OSM-PY-telegram": {
                 "name": "OSM Paraguay on Telegram",
                 "description": "OpenStreetMap Paraguay Telegram chat"
@@ -11953,6 +11953,10 @@
                 "name": "OpenStreetMap Berlin Twitter",
                 "description": "Follow us on Twitter: {url}"
             },
+            "de-berlin-xmpp": {
+                "name": "OpenStreetMap Berlin-Brandenburg XMPP",
+                "description": "Join our XMPP Multi-User Chat: {url}"
+            },
             "de-forum": {
                 "name": "OpenStreetMap DE forum",
                 "description": "OpenStreetMap Germany web forum"
@@ -11965,13 +11969,21 @@
                 "name": "OpenStreetMap Germany IRC",
                 "description": "Join #osm-de on irc.oftc.net (port 6667)"
             },
+            "de-karlsruhe-mailinglist": {
+                "name": "Karlsruhe Mailing List",
+                "description": "This is the mailing list for the OSM community of Karlsruhe area"
+            },
+            "de-karlsruhe-meetup": {
+                "name": "OpenStreetMap Karlsruhe Meetup",
+                "description": "Mappers and OpenStreetMap users in the Karlsruhe area"
+            },
             "de-mailinglist": {
                 "name": "Talk-de Mailing List",
                 "description": "Talk-de is the official mailing list for the German OSM community"
             },
             "de-matrix": {
                 "name": "OpenStreetMap Germany Matrix",
-                "description": "Join #osm-de:matrix.org at https://riot.im/app/#/room/%23osm-de:matrix.org"
+                "description": "Join #osm-de:matrix.org at {url}"
             },
             "de-mv-mailinglist": {
                 "name": "Mecklenburg-Vorpommern Mailing List",
@@ -11985,10 +11997,26 @@
                 "name": "OWL Mailing List",
                 "description": "This is the mailing list for the Ostwestfalen-Lippe OSM community"
             },
+            "de-stuttgart-mailinglist": {
+                "name": "Stuttgart and Baden-Wuerttemberg Mailing List",
+                "description": "This is the mailing list for the OSM community of Stuttgart and whole Baden-Wuerttemberg"
+            },
+            "de-stuttgart-meetup": {
+                "name": "OpenStreetMap Stuttgart Meetup",
+                "description": "Mappers and OpenStreetMap users in the Stuttgart area"
+            },
             "de-telegram": {
                 "name": "OpenStreetMap Germany Telegram",
                 "description": "Join the OpenStreetMap Germany Telegram supergroup at {url}"
             },
+            "de-ulm_neuulm-meetup": {
+                "name": "OpenStreetMap Ulm Neu-Ulm Meetup",
+                "description": "Mappers and OpenStreetMap users in the Ulm and Neu-Ulm area"
+            },
+            "de-ulmeralb-meetup": {
+                "name": "OpenStreetMap Ulmer Alb Meetup",
+                "description": "Mappers and OpenStreetMap users in the Ulmer Alb area"
+            },
             "de-viersen-meetup": {
                 "name": "OpenStreetMap Viersen Meetup",
                 "description": "OSM community and users meetup Kreis Viersen and Mönchengladbach"
@@ -12029,6 +12057,10 @@
                 "name": "OpenStreetMap Rennes Wiki page",
                 "description": "Wiki page of Rennes OSM local group"
             },
+            "fr-38-wiki": {
+                "name": "OpenStreetMap Grenoble Wiki page",
+                "description": "Wiki page of Grenoble OSM local group"
+            },
             "fr-bzh-mailinglist": {
                 "name": "Talk-fr-bzh Mailing List",
                 "description": "Talk-fr-bzh mailing list"
@@ -12069,6 +12101,10 @@
                 "name": "OpenStreetMap France on Twitter",
                 "description": "OpenStreetMap France on Twitter: {url}"
             },
+            "fr-xmpp": {
+                "name": "OpenStreetMap France on XMPP",
+                "description": "Join osm-fr@chat.jabberfr.org"
+            },
             "galicia-wiki": {
                 "name": "OpenStreetMap Wikiproject Galicia",
                 "description": "Everything you need to know about mapping in Galicia: {url}"
@@ -12096,7 +12132,7 @@
             },
             "gr-matrix": {
                 "name": "OpenStreetMap Greece Matrix",
-                "description": "Join #osm-gr:matrix.org at https://riot.im/app/#/room/%23osm-gr:matrix.org"
+                "description": "Join #osm-gr:matrix.org at {url}"
             },
             "guatemala-telegram": {
                 "name": "OSM Guatemala on Telegram",
@@ -12107,7 +12143,7 @@
                 "description": "OpenStreetMap Croatia Facebook group"
             },
             "hr-forum": {
-                "name": "OSM Croaria Forum",
+                "name": "OSM Croatia Forum",
                 "description": "OpenStreetMap Croatia Forum"
             },
             "hr-irc": {
@@ -12249,10 +12285,29 @@
                 "name": "OpenStreetMap Wikiproject Latin America",
                 "description": "Everything you need to know about mapping in Latin America"
             },
+            "lombardia-telegram": {
+                "name": "OpenStreetMap Lombardia Mappers",
+                "description": "OpenStreetMap Lombardia Telegram chat"
+            },
+            "lu-github": {
+                "name": "OpenStreetMap LU on GitHub",
+                "description": "Everyone is welcome!",
+                "extendedDescription": "OSM Luxembourg on GitHub"
+            },
+            "lu-irc": {
+                "name": "OpenStreetMap LU IRC channel",
+                "description": "Join #osm-lu on irc.oftc.net (port 6667).",
+                "extendedDescription": "Feel free to join our IRC Room, it is bridged with Matrix. Let's bring the community together."
+            },
             "lu-mailinglist": {
                 "name": "Talk-lu Mailing List",
                 "description": "Official mailing list for the Luxembourgish OSM community"
             },
+            "lu-matrix": {
+                "name": "OpenStreetMap LU Matrix channel",
+                "description": "Everyone is welcome!",
+                "extendedDescription": "Feel free to join our Matrix Chat Room! Let's bring the community together."
+            },
             "mailinglist-sk-googlegroups": {
                 "name": "Slovak mailing list on google groups",
                 "description": "Official mailing list for Slovak community"
@@ -12275,6 +12330,11 @@
                 "name": "@OSMMoldova on Telegram",
                 "description": "OpenStreetMap Moldova Telegram chat"
             },
+            "mt-irc": {
+                "name": "OpenStreetMap Malta IRC",
+                "description": "Join #osm-mt on irc.oftc.net (port 6667)",
+                "extendedDescription": "Join #osm-mt on irc.oftc.net (port 6667), please be patient and wait for a few minutes if you ask a question"
+            },
             "ni-facebook": {
                 "name": "OpenStreetMap NI Community",
                 "description": "Mappers and OpenStreetMap on Facebook in Nicaragua"
@@ -12540,6 +12600,11 @@
                 "description": "All are welcome! Sign up at {signupUrl}",
                 "extendedDescription": "Mailinglist for Rome and Lazio area."
             },
+            "talk-it-lombardia_mailinglist": {
+                "name": "OSM Italy regional talk list for Lombardia",
+                "description": "All are welcome! Sign up at {signupUrl}",
+                "extendedDescription": "Mailinglist for Lombardia region."
+            },
             "talk-it-piemonte_mailinglist": {
                 "name": "OSM Italy regional talk list for Piemonte",
                 "description": "All are welcome! Sign up at {signupUrl}",
diff --git a/modules/core/history.js b/modules/core/history.js
index 841c12677..dc6adb172 100644
--- a/modules/core/history.js
+++ b/modules/core/history.js
@@ -15,7 +15,7 @@ import {
 
 
 export function coreHistory(context) {
-    var dispatch = d3_dispatch('change', 'merge', 'restore', 'undone', 'redone');
+    var dispatch = d3_dispatch('reset', 'change', 'merge', 'restore', 'undone', 'redone');
     var lock = utilSessionMutex('lock');
 
     // restorable if iD not open in another window/tab and a saved history exists in localStorage
@@ -362,6 +362,7 @@ export function coreHistory(context) {
                 _tree = coreTree(_stack[0].graph);
                 _checkpoints = {};
             }
+            dispatch.call('reset');
             dispatch.call('change');
             return history;
         },
diff --git a/modules/core/validator.js b/modules/core/validator.js
index 603642a1c..e546ae606 100644
--- a/modules/core/validator.js
+++ b/modules/core/validator.js
@@ -40,21 +40,24 @@ export function coreValidator(context) {
         }
     };
 
-
-    //
-    // clear caches, called whenever iD resets after a save
-    //
-    validator.reset = function() {
+    function reset(resetIgnored) {
         Array.from(_deferred).forEach(function(handle) {
             window.cancelIdleCallback(handle);
             _deferred.delete(handle);
         });
 
         // clear caches
-        _ignoredIssueIDs = {};
+        if (resetIgnored) _ignoredIssueIDs = {};
         _baseCache = validationCache();
         _headCache = validationCache();
         _validatedGraph = null;
+    }
+
+    //
+    // clear caches, called whenever iD resets after a save
+    //
+    validator.reset = function() {
+        reset(true);
     };
 
     validator.resetIgnoredIssues = function() {
@@ -404,6 +407,12 @@ export function coreValidator(context) {
         dispatch.call('validated');
     };
 
+    context.history()
+        .on('reset.validator', function() {
+            // cached issues aren't valid any longer if the history has been reset
+            reset(false);
+            validator.validate();
+        });
 
     // WHEN TO RUN VALIDATION:
     // When graph changes:
diff --git a/modules/osm/entity.js b/modules/osm/entity.js
index 2714672af..46e3b261b 100644
--- a/modules/osm/entity.js
+++ b/modules/osm/entity.js
@@ -198,6 +198,17 @@ osmEntity.prototype = {
         var deprecated = [];
         dataDeprecated.forEach(function(d) {
             var oldKeys = Object.keys(d.old);
+            if (d.replace) {
+                var hasExistingValues = Object.keys(d.replace).some(function(replaceKey) {
+                    if (!tags[replaceKey] || d.old[replaceKey]) return false;
+                    var replaceValue = d.replace[replaceKey];
+                    if (replaceValue === '*') return false;
+                    if (replaceValue === tags[replaceKey]) return false;
+                    return true;
+                });
+                // don't flag deprecated tags if the upgrade path would overwrite existing data - #7843
+                if (hasExistingValues) return;
+            }
             var matchesDeprecatedTags = oldKeys.every(function(oldKey) {
                 if (!tags[oldKey]) return false;
                 if (d.old[oldKey] === '*') return true;
diff --git a/modules/presets/collection.js b/modules/presets/collection.js
index c2f419cb1..dd1b56021 100644
--- a/modules/presets/collection.js
+++ b/modules/presets/collection.js
@@ -1,5 +1,4 @@
-import { utilArrayIntersection, utilArrayUniq } from '../util/array';
-import { utilEditDistance } from '../util';
+import { utilArrayUniq, utilEditDistance } from '../util';
 
 
 //
@@ -46,7 +45,7 @@ export function presetCollection(collection) {
     return _this.item(id);
   };
 
-  _this.search = (value, geometry, countryCodes) => {
+  _this.search = (value, geometry, countryCode) => {
     if (!value) return _this;
 
     value = value.toLowerCase().trim();
@@ -84,13 +83,10 @@ export function presetCollection(collection) {
     }
 
     let pool = _this.collection;
-    if (countryCodes) {
-      if (typeof countryCodes === 'string') countryCodes = [countryCodes];
-      countryCodes = countryCodes.map(code => code.toLowerCase());
-
+    if (countryCode) {
       pool = pool.filter(a => {
-        if (a.countryCodes && !utilArrayIntersection(a.countryCodes, countryCodes).length) return false;
-        if (a.notCountryCodes && utilArrayIntersection(a.notCountryCodes, countryCodes).length) return false;
+        if (a.countryCodes && a.countryCodes.indexOf(countryCode) === -1) return false;
+        if (a.notCountryCodes && a.notCountryCodes.indexOf(countryCode) !== -1) return false;
         return true;
       });
     }
diff --git a/modules/ui/commit_warnings.js b/modules/ui/commit_warnings.js
index 1279a5605..5c968e421 100644
--- a/modules/ui/commit_warnings.js
+++ b/modules/ui/commit_warnings.js
@@ -49,7 +49,7 @@ export function uiCommitWarnings(context) {
 
             var buttons = itemsEnter
                 .append('button')
-                .on('mouseover', function(d) {
+                .on('mouseover', function(d3_event, d) {
                     if (d.entityIds) {
                         context.surface().selectAll(
                             utilEntityOrMemberSelector(
@@ -63,7 +63,7 @@ export function uiCommitWarnings(context) {
                     context.surface().selectAll('.hover')
                         .classed('hover', false);
                 })
-                .on('click', function(d) {
+                .on('click', function(d3_event, d) {
                     context.validator().focusIssue(d);
                 });
 
diff --git a/modules/ui/feature_list.js b/modules/ui/feature_list.js
index e359b13fa..b69b4d234 100644
--- a/modules/ui/feature_list.js
+++ b/modules/ui/feature_list.js
@@ -323,14 +323,14 @@ export function uiFeatureList(context) {
         }
 
 
-        function mouseover(d) {
+        function mouseover(d3_event, d) {
             if (d.id === -1) return;
 
             utilHighlightEntities([d.id], true, context);
         }
 
 
-        function mouseout(d) {
+        function mouseout(d3_event, d) {
             if (d.id === -1) return;
 
             utilHighlightEntities([d.id], false, context);
diff --git a/modules/ui/field.js b/modules/ui/field.js
index bd92c1afd..d26343bf1 100644
--- a/modules/ui/field.js
+++ b/modules/ui/field.js
@@ -9,7 +9,6 @@ import { geoExtent } from '../geo/extent';
 import { uiFieldHelp } from './field_help';
 import { uiFields } from './fields';
 import { uiTagReference } from './tag_reference';
-import { utilArrayIntersection } from '../util/array';
 import { utilRebind, utilUniqueDomId } from '../util';
 
 
@@ -307,14 +306,16 @@ export function uiField(context, presetField, entityIDs, options) {
             if (!extent) return true;
 
             var center = extent.center();
-            var codes = countryCoder.iso1A2Codes(center).map(function(code) {
-                return code.toLowerCase();
-            });
+            var countryCode = countryCoder.iso1A2Code(center);
 
-            if (field.countryCodes && !utilArrayIntersection(codes, field.countryCodes).length) {
+            if (!countryCode) return false;
+
+            countryCode = countryCode.toLowerCase();
+
+            if (field.countryCodes && field.countryCodes.indexOf(countryCode) === -1) {
                 return false;
             }
-            if (field.notCountryCodes && utilArrayIntersection(codes, field.notCountryCodes).length) {
+            if (field.notCountryCodes && field.notCountryCodes.indexOf(countryCode) !== -1) {
                 return false;
             }
         }
diff --git a/modules/ui/preset_list.js b/modules/ui/preset_list.js
index aa92d508e..3402918ff 100644
--- a/modules/ui/preset_list.js
+++ b/modules/ui/preset_list.js
@@ -98,9 +98,9 @@ export function uiPresetList(context) {
             var results, messageText;
             if (value.length && extent) {
                 var center = extent.center();
-                var countryCodes = countryCoder.iso1A2Codes(center);
+                var countryCode = countryCoder.iso1A2Code(center);
 
-                results = presets.search(value, entityGeometries()[0], countryCodes);
+                results = presets.search(value, entityGeometries()[0], countryCode && countryCode.toLowerCase());
                 messageText = t('inspector.results', {
                     n: results.collection.length,
                     search: value
diff --git a/modules/ui/sections/validation_issues.js b/modules/ui/sections/validation_issues.js
index c74e7989a..3433a2dd1 100644
--- a/modules/ui/sections/validation_issues.js
+++ b/modules/ui/sections/validation_issues.js
@@ -83,13 +83,13 @@ export function uiSectionValidationIssues(id, severity, context) {
         var itemsEnter = items.enter()
             .append('li')
             .attr('class', function (d) { return 'issue severity-' + d.severity; })
-            .on('click', function(d) {
+            .on('click', function(d3_event, d) {
                 context.validator().focusIssue(d);
             })
-            .on('mouseover', function(d) {
+            .on('mouseover', function(d3_event, d) {
                 utilHighlightEntities(d.entityIds, true, context);
             })
-            .on('mouseout', function(d) {
+            .on('mouseout', function(d3_event, d) {
                 utilHighlightEntities(d.entityIds, false, context);
             });
 
diff --git a/package.json b/package.json
index 10a3d25e6..074886351 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "translations": "node scripts/update_locales.js"
   },
   "dependencies": {
-    "@ideditor/country-coder": "^4.0.0",
+    "@ideditor/country-coder": "^3.2.0",
     "@ideditor/location-conflation": "~0.5.0",
     "@mapbox/sexagesimal": "1.2.0",
     "@mapbox/togeojson": "0.16.0",
@@ -102,7 +102,7 @@
     "node-fetch": "^2.6.1",
     "npm-run-all": "^4.0.0",
     "object-inspect": "1.8.0",
-    "osm-community-index": "2.1.1",
+    "osm-community-index": "2.1.2",
     "phantomjs-prebuilt": "~2.1.11",
     "postcss": "^8.1.1",
     "postcss-selector-prepend": "^0.5.0",