diff --git a/app/ui/control.py b/app/ui/control.py
index ce298afe..264f1b52 100644
--- a/app/ui/control.py
+++ b/app/ui/control.py
@@ -340,7 +340,7 @@ class ControlBox(Gtk.HBox):
 
     def on_service_changed(self, ref):
         self._app._wait_dialog.show()
-        self._http_api.send(HttpAPI.Request.EPG, ref, self.update_epg_data)
+        self._http_api.send(HttpAPI.Request.EPG, quote(ref), self.update_epg_data)
 
     @run_idle
     def update_epg_data(self, epg):
diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index f3500cc3..192f0073 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -3146,8 +3146,8 @@ class Application(Gtk.Application):
         self.create_bouquets(BqGenType.EACH_TYPE)
 
     def create_bouquets(self, g_type):
-        gen_bouquets(self._services_view, self._bouquets_view, self._main_window, g_type, self._TV_TYPES,
-                     self._s_type, self.append_bouquet)
+        gen_bouquets(self._services_view, self._bouquets_view, self._main_window, g_type, self._s_type,
+                     self.append_bouquet)
 
     # ***************** Alternatives ********************* #
 
diff --git a/app/ui/main_helper.py b/app/ui/main_helper.py
index 52a6dddf..2cfa9e9d 100644
--- a/app/ui/main_helper.py
+++ b/app/ui/main_helper.py
@@ -530,7 +530,7 @@ def get_picon_pixbuf(path, size=32):
 
 # ***************** Bouquets *********************#
 
-def gen_bouquets(view, bq_view, transient, gen_type, tv_types, s_type, callback):
+def gen_bouquets(view, bq_view, transient, gen_type, s_type, callback):
     """ Auto-generate and append list of bouquets """
     fav_id_index = Column.SRV_FAV_ID
     index = Column.SRV_TYPE
@@ -545,8 +545,6 @@ def gen_bouquets(view, bq_view, transient, gen_type, tv_types, s_type, callback)
         if not is_only_one_item_selected(paths, transient):
             return
         service = Service(*model[paths][:Column.SRV_TOOLTIP])
-        if service.service_type not in tv_types:
-            bq_type = BqType.RADIO.value
         append_bouquets(bq_type, bq_view, callback, fav_id_index, index, model,
                         [service.package if gen_type is BqGenType.PACKAGE else
                          service.pos if gen_type is BqGenType.SAT else service.service_type], s_type)