diff --git a/controllers/mpog_software_plugin_controller.rb b/controllers/mpog_software_plugin_controller.rb
index d6414e2..4188476 100644
--- a/controllers/mpog_software_plugin_controller.rb
+++ b/controllers/mpog_software_plugin_controller.rb
@@ -151,10 +151,10 @@ class MpogSoftwarePluginController < ApplicationController
   def get_databases
     return render :json=>{} unless request.xhr? and params[:query]
 
-    data = DatabaseDescription.where("name ILIKE ?", "%#{params[:query]}%").collect {|db|
+    data = DatabaseDescription.where("name ILIKE ?", "%#{params[:query]}%").select("id, name").collect {|db|
       {:id=>db.id, :label=>db.name}
     }
-    other = [DatabaseDescription.last].collect { |db|
+    other = [DatabaseDescription.select("id, name").last].collect { |db|
       {:id=>db.id, :label=>db.name}
     }
 
diff --git a/lib/database_helper.rb b/lib/database_helper.rb
index 28d42e2..17a3b28 100644
--- a/lib/database_helper.rb
+++ b/lib/database_helper.rb
@@ -51,7 +51,7 @@ module DatabaseHelper
     database_name = if database_data[:database_description_id].blank?
       ""
     else
-      DatabaseDescription.find(database_data[:database_description_id]).name
+      DatabaseDescription.find(database_data[:database_description_id], :select=>"name").name
     end
 
     Proc::new do
--
libgit2 0.21.2