diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js
index 3b1880ea..99f0301e 100644
--- a/src/webui/static/app/epg.js
+++ b/src/webui/static/app/epg.js
@@ -862,7 +862,7 @@ tvheadend.epg = function() {
         };
         if (params.title) conf.title = params.title;
         if (params.channel) conf.channel = params.channel;
-        if (params.tag) conf.tag = params.tag;
+        if (params.tag) conf.tag = params.channelTag;
         if (params.contentType) conf.content_type = params.contentType;
         if (params.durationMin) conf.minduration = params.durationMin;
         if (params.durationMax) conf.maxduration = params.durationMax;
diff --git a/src/webui/static/app/idnode.js b/src/webui/static/app/idnode.js
index 9d945c46..37b58137 100644
--- a/src/webui/static/app/idnode.js
+++ b/src/webui/static/app/idnode.js
@@ -297,13 +297,13 @@ tvheadend.IdNodeField = function(conf)
                 var t = [];
                 var d = v.push ? v : [v];
                 for (var i = 0; i < d.length; i++) {
-                    var r = st.find('key', d[i]);
-                    if (r !== -1) {
-                        var nv = st.getAt(r).get('val');
+                    var r = st.getById(d[i]);
+                    if (r) {
+                        var nv = r.data.val;
                         if (nv)
                             t.push(nv);
                     } else {
-                      t.push(d[i]);
+                        t.push(d[i]);
                     }
                 }
                 t.sort();