diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index f463429c..c2cea94b 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -23,7 +23,7 @@ class SessionsController < ApplicationController
     @user = User.new
 	
 	@connor = User.find(555629996)
-	@map = Map.find(:first, 5)
+	@map = Map.first(:conditions => [ "id = ?", 5])
 		
     if @map
       respond_with(@user, @session, location: user_map_url(@connor,@map)) do |format| 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index cd46ebd4..b03bfc18 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -40,7 +40,7 @@ class UsersController < ApplicationController
 	
 	# direct them straight to the metamaps manual map. 
 	@connor = User.find(555629996)
-	@map = Map.find(:first, 5)
+    @map = Map.first(:conditions => [ "id = ?", 5])
         
     if @map
       respond_with(@user, location: user_map_url(@connor,@map)) do |format|
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index dc3a1260..e696c43a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -65,7 +65,7 @@
 		</div>
 			
     <div class="footer">
-      <% unless Map.find(:first, 7).nil? %>
+      <% unless Map.first(:conditions => [ "id = ?", 7]).nil? %>
         <div class="feedback"><%= link_to "Feedback", user_map_path(User.find(555629996), Map.find(7)) %></div>
       <% end %>
 	  <div class="legend">