diff --git a/views/mpog_software_plugin_myprofile/_database_fields.html.erb b/views/mpog_software_plugin_myprofile/_database_fields.html.erb
index 2c33490..f53fa55 100644
--- a/views/mpog_software_plugin_myprofile/_database_fields.html.erb
+++ b/views/mpog_software_plugin_myprofile/_database_fields.html.erb
@@ -1,6 +1,7 @@
 <%= fields_for :database_description, @database_description do |db| %>
 
 <div id='databases'>
+  <% database = [] if database.nil? %>
 	<% DatabaseHelper.database_as_tables(database).each do |tab| %>
 	  <%= tab.call %>
 	<%end%>
diff --git a/views/mpog_software_plugin_myprofile/_language_fields.html.erb b/views/mpog_software_plugin_myprofile/_language_fields.html.erb
index 0ab7ab8..6a56f6a 100644
--- a/views/mpog_software_plugin_myprofile/_language_fields.html.erb
+++ b/views/mpog_software_plugin_myprofile/_language_fields.html.erb
@@ -1,6 +1,7 @@
 <%= fields_for :software_language, @software_language do |lng| %>
 
 <div id='languages'>
+  <% languages = [] if languages.nil? %>
 	<% SoftwareLanguageHelper.language_as_tables(languages).each do |tab| %>
 	  <%= tab.call %>
 	<%end%>
diff --git a/views/mpog_software_plugin_myprofile/_library_fields.html.erb b/views/mpog_software_plugin_myprofile/_library_fields.html.erb
index da365c6..2fea663 100644
--- a/views/mpog_software_plugin_myprofile/_library_fields.html.erb
+++ b/views/mpog_software_plugin_myprofile/_library_fields.html.erb
@@ -1,6 +1,7 @@
 <%= fields_for :library ,@library do |lib| %>
 
 <div id='libraries'>
+  <% libraries = [] if libraries.nil? %>
 	<% LibraryHelper.library_as_tables(libraries).each do |tab| %>
 	  <%= tab.call %>
 	<% end %>
diff --git a/views/mpog_software_plugin_myprofile/_operating_system_fields.html.erb b/views/mpog_software_plugin_myprofile/_operating_system_fields.html.erb
index c712eee..7585db5 100644
--- a/views/mpog_software_plugin_myprofile/_operating_system_fields.html.erb
+++ b/views/mpog_software_plugin_myprofile/_operating_system_fields.html.erb
@@ -1,6 +1,7 @@
 <%= fields_for :operating_systems ,@operating_systems do |lib| %>
 
 <div id='operating_systems'>
+  <% operating_systems_fields = [] if operating_systems_fields.nil? %>
 	<% OperatingSystemHelper.operating_system_as_tables(operating_systems_fields).each do |tab| %>
 	  <%= tab.call %>
 	<% end %>
diff --git a/views/mpog_software_plugin_myprofile/_public_software_info.html.erb b/views/mpog_software_plugin_myprofile/_public_software_info.html.erb
index 9404d72..31ac58a 100644
--- a/views/mpog_software_plugin_myprofile/_public_software_info.html.erb
+++ b/views/mpog_software_plugin_myprofile/_public_software_info.html.erb
@@ -65,42 +65,30 @@
 
 <div id='libraries_fields'>
   <h4> <%= _("Libraries") %> </h4>
-  <% if @list_libraries.blank? %>
-    <%= LibraryHelper.library_as_tables(nil).call %>
-  <% else %>
-  <%= render :partial => 'library_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :libraries => @list_libraries } %>
-  <% end %>
+
+  <%= render :partial => 'library_fields', :locals => {:object_name => 'community', :profile => @community, :libraries => @list_libraries } %>
 </div>
 <br />
 
 <div id='operating_system_fields'>
   <h4> <%= _("Operating Systems") %> </h4>
-  <% if @list_operating_systems.blank? %>
-    <%= OperatingSystemHelper.operating_system_as_tables(nil, false).call %>
-  <% else %>
+
   <%= render :partial => 'operating_system_fields', :locals => {:object_name => 'community', :profile => @community, :operating_systems_fields => @list_operating_systems} %>
-  <% end %>
 </div>
 <br />
 
 <br />
 <div id='programming_languages_fields'>
   <h4> <%= _("Programming languages") %> </h4>
-  <% if @list_languages.blank? %>
-    <%= SoftwareLanguageHelper.language_as_tables(nil, false).call %>
-  <% else %>
+
   <%= render :partial => 'language_fields', :locals => { :object_name => 'community', :profile => @community, :languages => @list_languages } %>
-  <% end %>
 </div>
 
 <br />
 <div id='database_fields'>
   <h4> <%= _("Databases") %> </h4>
-  <% if @list_databases.blank? %>
-    <%= DatabaseHelper.database_as_tables(nil, true).call %>
-  <% else %>
+
   <%= render :partial => 'database_fields', :locals => {:object_name => 'community', :profile => @community, :database => @list_databases } %>
-  <% end %>
 </div>
 
 <div id="software_categories_fields">
--
libgit2 0.21.2