diff --git a/app/controllers/admin/personal_plugin_fields_controller.rb b/app/controllers/admin/personal_plugin_fields_controller.rb
index 4f557ea..6ff92dc 100644
--- a/app/controllers/admin/personal_plugin_fields_controller.rb
+++ b/app/controllers/admin/personal_plugin_fields_controller.rb
@@ -798,7 +798,7 @@ class Admin::PersonalPluginFieldsController < OrbitMemberController
 					match_count = parse_content.match(/^ *\* *\d+/m)
 					match_count = match_count ? match_count[0] : nil
 					has_exist_condition = parse_content.split("\n")[0].match(/if[ ]+\w+/).present?
-					exist_condition = parse_content.split("\n")[0].match(/if[ ]+#{::Regexp.escape(k)}(?=\.| |$)/)
+					exist_condition = parse_content.split("\n")[0].match(/if[ ]+#{::Regexp.escape(k)}(?=\.| |$|\r)/)
 					if has_exist_condition && exist_condition.nil? #if this block is for other variables, then not proccessing
 						@parse_again_mode = false
 						result
diff --git a/app/views/admin/personal_plugin_fields/_render_table.html.erb b/app/views/admin/personal_plugin_fields/_render_table.html.erb
index 4273887..5711bfd 100644
--- a/app/views/admin/personal_plugin_fields/_render_table.html.erb
+++ b/app/views/admin/personal_plugin_fields/_render_table.html.erb
@@ -62,9 +62,9 @@
           handle: ".brand",
           update: function(event, ui) {
             var item = ui.item;
-            var new_index = item.index();
-            var old_index = item.attr("index");
-            var indices = [new_index,old_index].sort();
+            var n_index = item.index();
+            var o_index = item.attr("index");
+            var indices = [n_index,o_index].sort();
             for(var new_i=indices[0];new_i<=indices[1];new_i++){
               var td = item.parent().find(">").eq(new_i);
               td.attr("index",new_i);
diff --git a/template_generator/app/controllers/personal_plugin_templates_controller.rb b/template_generator/app/controllers/personal_plugin_templates_controller.rb
index 538db30..d5ada92 100644
--- a/template_generator/app/controllers/personal_plugin_templates_controller.rb
+++ b/template_generator/app/controllers/personal_plugin_templates_controller.rb
@@ -167,6 +167,6 @@ class PersonalPluginTemplatesController < ApplicationController
 		return plugin_templates
 	end
 	def gsub_invalid_character(text)
-		text.to_s.gsub(/(\/|\*|\\|\]|\[|\(|\)|\.|\+|\?|\!)/){|ff| "\\"+ff}
+		::Regexp.escape(text.to_s)
 	end
 end