diff --git a/src/service.c b/src/service.c
index 44a0252d..94316eae 100644
--- a/src/service.c
+++ b/src/service.c
@@ -127,14 +127,19 @@ static const char *
 service_class_get_title ( idnode_t *self )
 {
   static char *ret = NULL;
+  const char *str = NULL;
   service_t *s = (service_t*)self;
+  pthread_mutex_lock(&s->s_stream_mutex);
   if (ret) {
     free(ret);
     ret = NULL;
   }
-  pthread_mutex_lock(&s->s_stream_mutex); 
-  if (s->s_nicename)
-    ret = strdup(s->s_nicename);
+  if (s->s_channel_name)
+    str = s->s_channel_name(s);
+  if (!str)
+    str = s->s_nicename;
+  if (str)
+    ret = strdup(str);
   pthread_mutex_unlock(&s->s_stream_mutex);
   return ret;
 }
diff --git a/src/webui/static/app/idnode.js b/src/webui/static/app/idnode.js
index 01e6c362..9120235e 100644
--- a/src/webui/static/app/idnode.js
+++ b/src/webui/static/app/idnode.js
@@ -128,10 +128,11 @@ tvheadend.idnode_editor_field = function(f, create)
           valueField      : 'key',
           displayField    : 'val',
           store           : tvheadend.idnode_enum_store(f),
-          typeAhead       : true,
-          forceSelection  : true,
+          /*typeAhead       : true,*/
+          /*forceSelection  : true,*/
           triggerAction   : 'all',
           emptyText       :'Select ' + f.caption +' ...',
+          clearFilterOnReset: false,
           listeners       : { 
             keyup: function() {
               this.store.filter('val', this.getRawValue(), true, false);