diff --git a/app/helpers/org_subfields_helper.rb b/app/helpers/org_subfields_helper.rb
index a9f8a396f..8dad7096f 100644
--- a/app/helpers/org_subfields_helper.rb
+++ b/app/helpers/org_subfields_helper.rb
@@ -1,2 +1,3 @@
 module OrgSubfieldsHelper
+  include OrganizationsHelper
 end
diff --git a/app/views/org_subfields/create.js.erb b/app/views/org_subfields/create.js.erb
index f29799707..345c8f60f 100644
--- a/app/views/org_subfields/create.js.erb
+++ b/app/views/org_subfields/create.js.erb
@@ -1,5 +1,7 @@
 $("#org_subfield_list").html("");
-$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',:locals => {:subfields => @organization.org_subfields }) %>");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',
+    :locals => {:default_fields => @organization.org_subfields.where("field_type='default'"),
+    :subfields => @organization.org_subfields.where("field_type != 'default'") }) %>");
 $("#sub_field_left_lists").html("");
 $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
 $("#subfield_name").val("");
\ No newline at end of file
diff --git a/app/views/org_subfields/destroy.js.erb b/app/views/org_subfields/destroy.js.erb
index 8a676e93e..2ba03fc36 100644
--- a/app/views/org_subfields/destroy.js.erb
+++ b/app/views/org_subfields/destroy.js.erb
@@ -1,4 +1,6 @@
 $("#org_subfield_list").html("");
-$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',:locals => {:subfields => @organization.org_subfields }) %>");
+$("#org_subfield_list").html("<%= escape_javascript(render :partial => 'organizations/subfield_list',
+    :locals => {:default_fields => @organization.org_subfields.where("field_type='default'"),
+    :subfields => @organization.org_subfields.where("field_type != 'default'") }) %>");
 $("#sub_field_left_lists").html("");
 $("#sub_field_left_lists").html("<%= escape_javascript(render :partial => 'organizations/org_left_subfield_list', :locals => {:organization => @organization}) %>");
\ No newline at end of file