diff --git a/modules/presets/preset.js b/modules/presets/preset.js
index 70cdb3a94..d7da3b236 100644
--- a/modules/presets/preset.js
+++ b/modules/presets/preset.js
@@ -61,8 +61,15 @@ export function Preset(id, preset, fields) {
             value = preset.tags[key];
 
         if (geometry === 'relation' && key === 'type') {
-            return { rtype: value };
-        } else if (value === '*') {
+            if (value in preset.tags) {
+                key = value;
+                value = preset.tags[key];
+            } else {
+                return { rtype: value };
+            }
+        }
+
+        if (value === '*') {
             return { key: key };
         } else {
             return { key: key, value: value };
diff --git a/modules/services/taginfo.js b/modules/services/taginfo.js
index 0df8cd83c..b2bc188f7 100644
--- a/modules/services/taginfo.js
+++ b/modules/services/taginfo.js
@@ -156,7 +156,7 @@ export function init() {
 
         request(endpoint + path + qsString(parameters), debounce, function(err, d) {
             if (err) return callback(err);
-            callback(null, d.data);
+            callback(null, parameters.rtype ? d : d.data);
         });
     };