diff --git a/app/views/forum_posts/_forum_post.html.erb b/app/views/forum_posts/_forum_post.html.erb
index 014e4bdeb..7ca48ea8e 100644
--- a/app/views/forum_posts/_forum_post.html.erb
+++ b/app/views/forum_posts/_forum_post.html.erb
@@ -7,7 +7,7 @@
       <% end %>
     </h4>
     <p>
-      <%= time_ago_in_words_tagged(forum_post.created_at) %> ago
+      <%= time_ago_in_words_tagged(forum_post.created_at) %>
     </p>
   </div>
   <div class="content">
diff --git a/app/views/notes/_note.html.erb b/app/views/notes/_note.html.erb
index 4d4f860c7..81e9bcd3c 100644
--- a/app/views/notes/_note.html.erb
+++ b/app/views/notes/_note.html.erb
@@ -1,3 +1,3 @@
-<article data-width="<%= note.width %>" data-height="<%= note.height %>" data-x="<%= note.x %>" note-y="<%= note.y %>" data-id="<%= note.id %>">
+<article data-width="<%= note.width %>" data-height="<%= note.height %>" data-x="<%= note.x %>" data-y="<%= note.y %>" data-id="<%= note.id %>">
   <%= raw DText.sanitize(note.body) %>
 </article>
\ No newline at end of file
diff --git a/config/deploy.rb b/config/deploy.rb
index 3014b52ce..959bb32c8 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -93,12 +93,12 @@ end
 namespace :delayed_job do
   desc "Start delayed_job process"
   task :start, :roles => :app do
-    run "cd #{current_path}; RAILS_ENV=#{rails_env} bundle exec script/delayed_job start"
+    run "cd #{current_path}; RAILS_ENV=#{rails_env} bundle exec ruby script/delayed_job start"
   end
   
   desc "Stop delayed_job process"
   task :stop, :roles => :app do
-    run "cd #{current_path}; RAILS_ENV=#{rails_env} bundle exec script/delayed_job stop"
+    run "cd #{current_path}; RAILS_ENV=#{rails_env} bundle exec ruby script/delayed_job stop"
   end
   
   desc "Restart delayed_job process"
diff --git a/config/routes.rb b/config/routes.rb
index 1aa057829..d41fc4338 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -221,12 +221,12 @@ Danbooru::Application.routes.draw do
   
   match "/post/index.xml", :controller => "legacy", :action => "posts", :format => "xml"
   match "/post/index.json", :controller => "legacy", :action => "posts", :format => "json"
-  match "/post/index" => redirect {|params, req| "/posts?tags=#{req.params[:tags]}&page=#{req.params[:page]}"}
-  match "/post" => redirect {|params, req| "/posts?tags=#{req.params[:tags]}&page=#{req.params[:page]}"}
+  match "/post/index" => redirect {|params, req| "/posts?tags=#{req.params[:tags].to_s.gsub(/ /, '%20')}&page=#{req.params[:page]}"}
+  match "/post" => redirect {|params, req| "/posts?tags=#{req.params[:tags].to_s.gsub(/ /, '%20')}&page=#{req.params[:page]}"}
   match "/post/upload" => redirect("/uploads/new")
   match "/post/moderate" => redirect("/moderator/post/queue")
-  match "/post/atom" => redirect("/posts.atom")
-  match "/post/atom.feed" => redirect("/posts.atom")
+  match "/post/atom" => redirect {|params, req| "/posts.atom?tags=#{req.params[:tags].to_s.gsub(/ /, '%20')}"}
+  match "/post/atom.feed" => redirect {|params, req| "/posts.atom?tags=#{req.params[:tags].to_s.gsub(/ /, '%20')}"}
   match "/post/popular_by_day" => redirect("/explore/posts/popular")
   match "/post/popular_by_week" => redirect("/explore/posts/popular")
   match "/post/popular_by_month" => redirect("/explore/posts/popular")