diff --git a/source/libublsettings-config.c b/source/libublsettings-config.c
index 62ee961..3332538 100644
--- a/source/libublsettings-config.c
+++ b/source/libublsettings-config.c
@@ -371,6 +371,7 @@ int yon_config_command_get_section_pos(const char *command){
     for (int i=0;i<size-1;i++){
         if (!strcmp(parsed[i],"get")||!strcmp(parsed[i],"set")||!strcmp(parsed[i],"remove")){
             pos = i+1;
+            break;
         }
     }
     yon_char_parsed_free(parsed,size);
@@ -1028,11 +1029,31 @@ config_str yon_config_load_file(FILE *file, int *str_len) {
     return output_strings;
 }
 
+char *yon_config_parameter_wrap(char *parameter_key){
+    char *cur = NULL;
+    int size;
+    config_str parsed = yon_char_parse(parameter_key,&size,"[");
+    char *temp = yon_char_append("\'",parsed[1]);
+    free(parsed[1]);
+    parsed[1] = temp;
+    char *half_wrapped = yon_char_parsed_to_string_full(parsed,size,"[");
+    yon_char_parsed_free(parsed,size);
+    parsed = yon_char_parse(half_wrapped,&size,"]");
+    temp = yon_char_append_c(parsed[size-2],'\'');
+    free(parsed[size-2]);
+    parsed[size-2] = temp;
+
+    char *full_wrapped = yon_char_parsed_to_string_full(parsed,size,"]");
+    free(half_wrapped);
+    yon_char_parsed_free(parsed,size);
+    return full_wrapped;
+}
 
 char *yon_config_parameter_to_string(yon_config_parameter *parameter, int insert_section){
     if (parameter){
         char *param_string = NULL;
-        param_string = yon_char_unite(insert_section?parameter->section:"",insert_section?" ":"", parameter->key,parameter->flag1==-1?NULL:"","=\'",parameter->data,"\'",NULL);
+        char *parameter_wrapped = yon_config_parameter_wrap(parameter->key);
+        param_string = yon_char_unite(insert_section?parameter->section:"",insert_section?" ":"", parameter_wrapped,parameter->flag1==-1?NULL:"","=\'",parameter->data,"\'",NULL);
         return param_string;
     }
     return NULL;
@@ -1120,7 +1141,7 @@ config_str yon_config_get_save_parameters_by_list(int *size, config_str paramete
 
                 }
             } else {
-                char *string = yon_char_unite("remove"," ",parameters[i],NULL);
+                char *string = yon_char_unite("remove"," ",yon_config_parameter_wrap(parameters[i]),NULL);
                 yon_char_parsed_add_or_create_if_exists(removed,&removed_size,string);
             }
         }
diff --git a/source/libublsettings.h b/source/libublsettings.h
index 14edaba..b3dbafc 100644
--- a/source/libublsettings.h
+++ b/source/libublsettings.h
@@ -694,6 +694,8 @@ char *yon_char_unite(const char *source, ...);
 
 char *yon_cut(char *source, int size, int startpos);
 
+int yon_char_check_element(char *target, char *element, char *divider);
+
 /**
  * @brief Check if string begins with substring.
  * 
@@ -1205,6 +1207,8 @@ config_str yon_config_get_save_parameters_by_key(int *size, ...);
 
 config_str yon_config_get_save_parameters(int *size);
 
+char *yon_config_parameter_wrap(char *parameter_key);
+
 /**yon_config_parameter_prepare_command(char *command, char *path, char *section, char *parameter)
  * 
 */