diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb
index b620595..6f16a76 100644
--- a/app/controllers/admin/members_controller.rb
+++ b/app/controllers/admin/members_controller.rb
@@ -151,7 +151,7 @@ class Admin::MembersController < OrbitMemberController
     @member_query = params[:member_query]
     page_num = params[:page] || 1
     if !@member_query.blank?
-      members = MemberProfile.all.any_of({:user_id => /#{@member_query}/i}, {:first_name => /#{@member_query}/i}, {:last_name => /#{@member_query}/i}, {:email => /#{@member_query}/i}).page(page_num).per(12)
+      members = MemberProfile.all.any_of({:user_id => /#{@member_query}/i}, {:first_name => /#{@member_query}/i}, {:last_name => /#{@member_query}/i}, {:email => /#{@member_query}/i})
       @members = members.collect do |member|
         if !member.user.approved
           member.user
diff --git a/app/controllers/page_parts_controller.rb b/app/controllers/page_parts_controller.rb
index ed48ef3..bd15445 100644
--- a/app/controllers/page_parts_controller.rb
+++ b/app/controllers/page_parts_controller.rb
@@ -72,7 +72,11 @@ class PagePartsController < ApplicationController
       end
     end
     if final_params["kind"] == "none"
+      page_part = subpart.page_part
       subpart.destroy
+      if page_part.sub_parts.count == 0
+        page_part.destroy
+      end
     else
       subpart.update_attributes(final_params)
     end
diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb
index 786ce2c..d524600 100644
--- a/app/helpers/pages_helper.rb
+++ b/app/helpers/pages_helper.rb
@@ -31,7 +31,7 @@ module PagesHelper
               item.each do |key,value|
                 if !value.kind_of?(Array)
                   value = value.nil? ? "" : value
-                  element = element.gsub("{{#{key}}}",value.to_s)
+                  element = element.gsub("{{#{key}}}",value.to_s.html_safe)
                   element = element.gsub("%7B%7B#{key}%7D%7D",value.to_s)
                 end
               end
@@ -62,7 +62,7 @@ module PagesHelper
     end
     if keys[1]
       (data[keys[1]].kind_of?(Array) ?  data[keys[0]] : data[keys[1]]).each do |key,value|
-        html = html.gsub("{{#{key}}}",value.to_s)
+        html = html.gsub("{{#{key}}}",value.to_s.html_safe)
         html = html.gsub("%7B%7B#{key}%7D%7D",value.to_s)
       end
     end