diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 04d97ad..7387cef 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -185,7 +185,6 @@ module ApplicationHelper
 				if d[data_name]
 					d[data_name].each_with_index do |item,i|
 						element = el.inner_html
-						element = render_link_to_edit(element, item['url_to_edit']) if !item['url_to_edit'].nil?
 						if wrap_elements.count > 0
 							htmls = parsing_repeats_again(wrap_elements,d[data_name][i], level + 1)
 							htmls[0].each_with_index do |html,i|
@@ -197,6 +196,7 @@ module ApplicationHelper
 								value = value.nil? ? "" : value
 								element = element.gsub("{{#{key}}}",value.to_s)
 								element = element.gsub("%7B%7B#{key}%7D%7D",value.to_s)
+								element = render_link_to_edit(element, value) if key.eql?("url_to_edit")
 							end
 						end
 						html_to_render = html_to_render + element
diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb
index 7bb3f48..7177a65 100644
--- a/app/helpers/pages_helper.rb
+++ b/app/helpers/pages_helper.rb
@@ -12,7 +12,7 @@ module PagesHelper
   end
 
   def render_widget_for_frontend(controller_name, widget_method, widget_file)
-    def parsing_repeats_again(elements,d,level)
+    def widget_parsing_repeats_again(elements,d,level)
         newhtml = []
         oldhtml = []
         elements.each do |el|
@@ -23,7 +23,7 @@ module PagesHelper
             d["#{data_name}"].each_with_index do |item,i|
               element = el.inner_html
               if wrap_elements.count > 0
-                htmls = parsing_repeats_again(wrap_elements,d["#{data_name}"][i], level + 1)
+                htmls = widget_parsing_repeats_again(wrap_elements,d["#{data_name}"][i], level + 1)
                 htmls[0].each_with_index do |html,i|
                   element = element.gsub(html,htmls[1][i])      
                 end
@@ -70,7 +70,7 @@ module PagesHelper
     data = controller.send("#{widget_method}") rescue nil
     if !data.nil?
       wrap_elements = doc.css("*[data-list][data-level='0']")
-      htmls = parsing_repeats_again(wrap_elements,data,1)
+      htmls = widget_parsing_repeats_again(wrap_elements,data,1)
       html = doc.to_s
       htmls[0].each_with_index do |h,i|
         html = html.gsub(h,htmls[1][i])