diff --git a/app/eparser/enigma/bouquets.py b/app/eparser/enigma/bouquets.py
index 531eabf1..14bcf0dc 100644
--- a/app/eparser/enigma/bouquets.py
+++ b/app/eparser/enigma/bouquets.py
@@ -1,4 +1,6 @@
 """ Module for parsing bouquets """
+import re
+
 from app.eparser.ecommons import BqServiceType, BouquetService, Bouquets, Bouquet, BqType
 
 _TV_ROOT_FILE_NAME = "bouquets.tv"
@@ -13,32 +15,33 @@ def get_bouquets(path):
 def write_bouquets(path, bouquets):
     srv_line = '#SERVICE 1:7:1:0:0:0:0:0:0:0:FROM BOUQUET "userbouquet.{}.{}" ORDER BY bouquet\n'
     line = []
+    pattern = re.compile("[^\w_()]+")
 
     for bqs in bouquets:
         line.clear()
         line.append("#NAME {}\n".format(bqs.name))
 
         for bq in bqs.bouquets:
-            line.append(srv_line.format(bq.name.replace(" ", "_"), bq.type))
-            write_bouquet(path, bq.name, bq.type, bq.services)
+            bq_name = re.sub(pattern, "_", bq.name)
+            line.append(srv_line.format(bq_name, bq.type))
+            write_bouquet(path + "userbouquet.{}.{}".format(bq_name, bq.type), bq.name, bq.services)
 
         with open(path + "bouquets.{}".format(bqs.type), "w", encoding="utf-8") as file:
             file.writelines(line)
 
 
-def write_bouquet(path, name, bq_type, channels):
+def write_bouquet(path, name, channels):
     bouquet = ["#NAME {}\n".format(name)]
 
     for ch in channels:
         if not ch:  # if was duplicate
             continue
-
         if ch.service_type == BqServiceType.IPTV.name or ch.service_type == BqServiceType.MARKER.name:
             bouquet.append("#SERVICE {}\n".format(ch.fav_id.strip()))
         else:
             bouquet.append("#SERVICE {}\n".format(to_bouquet_id(ch)))
 
-    with open(path + "userbouquet.{}.{}".format(name.replace(" ", "_"), bq_type), "w", encoding="utf-8") as file:
+    with open(path, "w", encoding="utf-8") as file:
         file.writelines(bouquet)
 
 
diff --git a/app/ui/service_details_dialog.glade b/app/ui/service_details_dialog.glade
index 405bad9f..4fe67823 100644
--- a/app/ui/service_details_dialog.glade
+++ b/app/ui/service_details_dialog.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk+" version="3.16"/>
   <object class="GtkListStore" id="fec_list_store">
     <columns>
       <!-- column-name fec -->
@@ -224,6 +224,9 @@
     <property name="icon_name">document-properties-symbolic</property>
     <property name="type_hint">dialog</property>
     <property name="gravity">center</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog_vbox">
         <property name="can_focus">False</property>
@@ -943,24 +946,39 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkSwitch" id="tr_edit_switch">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="tooltip_text" translatable="yes">Edit</property>
-                    <signal name="state-set" handler="on_tr_edit_toggled" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
+                  <placeholder/>
                 </child>
                 <child>
-                  <object class="GtkImage" id="image1">
+                  <object class="GtkBox" id="tr_edit_switch_box">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_right">10</property>
-                    <property name="stock">gtk-edit</property>
+                    <property name="spacing">2</property>
+                    <child>
+                      <object class="GtkSwitch" id="tr_edit_switch">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip_text" translatable="yes">Edit</property>
+                        <signal name="state-set" handler="on_tr_edit_toggled" swapped="no"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage" id="tr_edit_switch_image">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_right">10</property>
+                        <property name="stock">gtk-edit</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1549,6 +1567,9 @@
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="gravity">center</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="tr_services_dialog_vbox">
         <property name="can_focus">False</property>