diff --git a/app/controllers/tweets_controller.rb b/app/controllers/tweets_controller.rb
index ca28baa..d9569e2 100644
--- a/app/controllers/tweets_controller.rb
+++ b/app/controllers/tweets_controller.rb
@@ -1,5 +1,5 @@
 class TweetsController < ApplicationController
   def index
-    @docs = Tweet.search(params[:query]) if params[:query].present?
+    @docs = TweetIndexer.search(params[:query]) if params[:query].present?
   end
 end
diff --git a/app/models/tweet.rb b/app/models/tweet.rb
index f126315..f3fe4d5 100644
--- a/app/models/tweet.rb
+++ b/app/models/tweet.rb
@@ -3,17 +3,29 @@ def initialize(data)
     @data = data
   end
 
+  def id
+    @data['Id']
+  end
+
   def to_document
     {
-      :plixi_id      => @data['Id'],
-      :text          => @data['Message'],
-      :timestamp     => @data['UploadDate'].to_i,
-      :screen_name   => @data['ScreenName'],
-      :thumbnail_url => @data['ThumbnailUrl']
+      :plixi_id      => self.id,
+      :text          => self.message,
+      :timestamp     => self.upload_date.to_i,
+      :screen_name   => self.screen_name,
+      :thumbnail_url => self.thumbnail_url
     }
   end
 
   def indexable?
-    @data['Message'].present?
+    self.message.present?
+  end
+
+  def method_missing(name, *args, &block)
+    if @data[name.to_s.classify]
+      @data[name.to_s.classify]
+    else
+      super
+    end
   end
 end
\ No newline at end of file
diff --git a/app/models/tweet_indexer.rb b/app/models/tweet_indexer.rb
index f68f8be..db8bfbf 100644
--- a/app/models/tweet_indexer.rb
+++ b/app/models/tweet_indexer.rb
@@ -1,5 +1,5 @@
 require 'open-uri'
-require 'lib/indextank_client'
+require 'indextank_client'
 
 class TweetIndexer
   def self.index