diff --git a/sinitter.rb b/sinitter.rb
index 4c34d41..0533fe1 100755
--- a/sinitter.rb
+++ b/sinitter.rb
@@ -43,8 +43,8 @@
 end
 
 get '/search' do
-  query = params[:q] || ''
-  @search = @client.search(query, :page => params[:page])
+  params[:q] ||= 'sinitter OR twitter_oauth'
+  @search = @client.search(params[:q], :page => params[:page], :per_page => params[:per_page])
   erb :search
 end
 
diff --git a/views/_results.erb b/views/_results.erb
index 9c0d4cf..ecd1871 100644
--- a/views/_results.erb
+++ b/views/_results.erb
@@ -1,14 +1,14 @@
 <div class="timeline">
-    <% @search.results.each do |result| %>
+    <% @search['results'].each do |result| %>
         <p>
             <div style="float:left; margin:5px">
-                <a href="http://twitter.com/<%= result.from_user %>">
-                    <img src="<%= result.profile_image_url %>" width="48" height="48"/>
+                <a href="http://twitter.com/<%= result['from_user'] %>">
+                    <img src="<%= result['profile_image_url'] %>" width="48" height="48"/>
                 </a>
             </div>
             <div style="">
-                <a href="http://twitter.com/<%= result.from_user %>">@<%= result.from_user %></a>
-                <%= result.text %>
+                <a href="http://twitter.com/<%= result['from_user'] %>">@<%= result['from_user'] %></a>
+                <%= result['text'] %>
             </div>
             <br clear="all"/>
         </p>