diff --git a/css/app.css b/css/app.css
index bb473e00f..071904ffe 100644
--- a/css/app.css
+++ b/css/app.css
@@ -11,7 +11,10 @@ html, body {
 }
 
 body {
-    font:normal 12px/1.6667 'Helvetica Neue', Arial, sans-serif;
+    font: normal 12px/1.6667 -apple-system, BlinkMacSystemFont,
+        "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
+        "Fira Sans", "Droid Sans", "Helvetica Neue", "Arial",
+        sans-serif;
     margin:0;
     padding:0;
     min-width: 768px;
@@ -148,7 +151,10 @@ a:hover {
 
 textarea  {
     resize: vertical;
-    font:normal 12px/20px 'Helvetica Neue', Arial, sans-serif;
+    font:normal 12px/20px -apple-system, BlinkMacSystemFont,
+        "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
+        "Fira Sans", "Droid Sans", "Helvetica Neue", "Arial",
+        sans-serif;
 }
 
 textarea,
diff --git a/modules/ui/fields/address.js b/modules/ui/fields/address.js
index 64c2cb48b..c3eb7f4f2 100644
--- a/modules/ui/fields/address.js
+++ b/modules/ui/fields/address.js
@@ -159,12 +159,13 @@ export function uiFieldAddress(field, context) {
             .style('width', function (d) { return d.width * 100 + '%'; });
 
         // Update
-        // setup dropdowns for common address tags
         var addrTags = [
-            'street', 'city', 'state', 'province', 'district',
-            'subdistrict', 'suburb', 'place', 'postcode'
+            'city', 'county', 'country', 'district', 'hamlet',
+            'neighbourhood', 'place', 'postcode', 'province',
+            'quarter', 'state', 'street', 'subdistrict', 'suburb'
         ];
 
+        // If fields exist for any of these tags, create dropdowns to pick nearby values..
         addrTags.forEach(function(tag) {
             var nearValues = (tag === 'street') ? getNearStreets
                     : (tag === 'city') ? getNearCities