diff --git a/app/models/person.rb b/app/models/person.rb
index ce881893e..d987eb103 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -55,8 +55,15 @@ class Person < ActiveRecord::Base
       sql << where_clause
       tokens.concat([token, token, token])
     end
-
-    Person.searchable.where(sql, *tokens).includes(:contacts).order("contacts.user_id DESC", "profiles.last_name ASC", "profiles.first_name ASC", "people.diaspora_handle ASC")
+#SELECT `people`.* FROM people
+#  INNER JOIN `profiles` ON `profiles`.person_id = `people`.id
+#  LEFT OUTER JOIN `contacts` ON (`contacts`.user_id = #{user.id} AND `contacts`.person_id = `people`.id)
+#  WHERE `profiles`.searchable = true AND
+#  `profiles`.first_name LIKE '%Max%'
+#  ORDER BY `contacts`.user_id DESC
+    Person.searchable.where(sql, *tokens).joins(
+      "LEFT OUTER JOIN `contacts` ON `contacts`.user_id = #{user.id} AND `contacts`.person_id = `people`.id"
+    ).order("contacts.user_id DESC", "profiles.last_name ASC", "profiles.first_name ASC", "people.diaspora_handle ASC")
   end
 
   def name