diff --git a/app/assets/javascripts/application/autocomplete.js b/app/assets/javascripts/application/autocomplete.js
index 8e42ea9a6997c1d0d63167d6d45b3f856eb4350d..6d532090f9258290ba92a88269fc08cc03b7491c 100644
--- a/app/assets/javascripts/application/autocomplete.js
+++ b/app/assets/javascripts/application/autocomplete.js
@@ -4,7 +4,7 @@ $(document).ready(function() {
 		source: function (request, response) {
 			$.ajax({
 				url: "/autocomplete",
-				data: { q: request.term },
+				data: { query: request.term },
 				dataType: "json",
 				success: response,
 				error: function () {
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index a4a001fba3f14a54442ed79e068f541b87132df0..70e9f5b69c8640ea40d04aa5e4e589df12ecd55a 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -18,14 +18,12 @@ class SearchController < ApplicationController
   end
 
   def autocomplete
-    begin
-      auto = AutocompleteService.new
-      query = params['q'] || ''
-      json_data = auto.query(query)
-      render text: json_data
-    rescue
-      render text: '[]'
-    end
+    render json: LearningObject.search(params[:query], {
+      fields: ['name^5', 'author'],
+      limit: 10,
+      load: false,
+      misspellings: { below: 5 }
+    }).map(&:name)
   end
 
   private
diff --git a/app/models/learning_object.rb b/app/models/learning_object.rb
index cadcdf4ebce7096b64f1c642bbf09f8b2de05032..0deef62269dbf0ad59d9c288f46f36656ada3e30 100644
--- a/app/models/learning_object.rb
+++ b/app/models/learning_object.rb
@@ -12,7 +12,7 @@ class LearningObject < ActiveRecord::Base
 
   belongs_to :publisher, polymorphic: true
 
-  searchkick language: "brazilian"
+  searchkick language: 'brazilian', searchable: [:name, :description, :author, :object_type]
 
   def search_data
     {