diff --git a/octoserve/var/channels/doepgscan.lua b/octoserve/var/channels/doepgscan.lua
index a0e198e..3c83f12 100755
--- a/octoserve/var/channels/doepgscan.lua
+++ b/octoserve/var/channels/doepgscan.lua
@@ -100,7 +100,7 @@ else
                   Params = Params .. " --mtype="..v
                end
             end
-            local Key,Sid = Channel.ID:match("^(%a+):%d+:%d+:(%d+)")
+            local Key,Sid = Channel.ID:match("^([A-Z0-9]+):%d+:%d+:(%d+)")
             if Key and Sid then
                local t = tl[Params]
                if t then
diff --git a/octoserve/var/channels/doscan.lua b/octoserve/var/channels/doscan.lua
index 9cdee33..855e777 100755
--- a/octoserve/var/channels/doscan.lua
+++ b/octoserve/var/channels/doscan.lua
@@ -262,7 +262,7 @@ if tl.SourceList then
                                  gname = ChannelOverwrite.Group
                               end
                               if ChannelOverwrite.Pids then
-                                 gname = ChannelOverwrite.Pids
+                                 pids = ChannelOverwrite.Pids
                               end
                               if ChannelOverwrite.Title then
                                  sname = ChannelOverwrite.Title
diff --git a/octoserve/var/www/epg.html b/octoserve/var/www/epg.html
index c8a324b..0a96142 100644
--- a/octoserve/var/www/epg.html
+++ b/octoserve/var/www/epg.html
@@ -209,7 +209,7 @@ function ShowEvent(event,index)
    var box = document.getElementById("event" + index);
 
    var d = new Date(event.Time);
-   var id = event.ID.match(/[A-Z]+:\d+:\d+:\d+/);
+   var id = event.ID.match(/[A-Z0-9]+:\d+:\d+:\d+/);
    var ch = ChannelLookup[id[0]];
    var Channel = "\u00A0";
    var Text = "";