diff --git a/app/ui/control.py b/app/ui/control.py
index a3d4b558..8bf441de 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 c4bad1e9..522df341 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -3235,8 +3235,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 8fd0250a..d2718862 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)
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index 47a2fb79..0295f229 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -566,6 +566,7 @@ Author: Dmitriy Yefremov
     <child>
       <object class="GtkScrolledWindow" id="filter_satellite_scrolled_window">
         <property name="width_request">135</property>
+        <property name="height_request">175</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="margin_left">5</property>
@@ -573,8 +574,6 @@ Author: Dmitriy Yefremov
         <property name="margin_top">5</property>
         <property name="margin_bottom">5</property>
         <property name="hscrollbar_policy">never</property>
-        <property name="max_content_height">350</property>
-        <property name="propagate_natural_height">True</property>
         <child>
           <object class="GtkTreeView" id="filter_satellite_view">
             <property name="visible">True</property>
@@ -653,6 +652,7 @@ Author: Dmitriy Yefremov
     <child>
       <object class="GtkTreeView" id="filter_type_view">
         <property name="width_request">135</property>
+        <property name="height_request">175</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="margin_left">5</property>
@@ -1906,8 +1906,8 @@ Author: Dmitriy Yefremov
                             <property name="can_focus">False</property>
                             <property name="margin_left">10</property>
                             <property name="margin_right">10</property>
-                            <property name="margin_top">2</property>
-                            <property name="margin_bottom">2</property>
+                            <property name="margin_top">5</property>
+                            <property name="margin_bottom">5</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkBox" id="filter_bar">