diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
index 513229aee..af1ae1e8b 100644
--- a/app/controllers/experiments_controller.rb
+++ b/app/controllers/experiments_controller.rb
@@ -77,6 +77,8 @@ class ExperimentsController < ApplicationController
 
   def canvas
     @project = @experiment.project
+    @active_modules = @experiment.active_modules
+                                 .includes(:tags, :inputs, :outputs)
     current_team_switch(@project.team)
   end
 
diff --git a/app/models/experiment.rb b/app/models/experiment.rb
index 9f2a7cfce..60d94beb6 100644
--- a/app/models/experiment.rb
+++ b/app/models/experiment.rb
@@ -208,7 +208,8 @@ class Experiment < ActiveRecord::Base
       end
     rescue ActiveRecord::ActiveRecordError,
            ArgumentError,
-           ActiveRecord::RecordNotSaved
+           ActiveRecord::RecordNotSaved => ex
+      logger.error ex.message
       return false
     end
     true
diff --git a/app/views/experiments/canvas.html.erb b/app/views/experiments/canvas.html.erb
index 798e1d845..ef6a09b04 100644
--- a/app/views/experiments/canvas.html.erb
+++ b/app/views/experiments/canvas.html.erb
@@ -58,7 +58,7 @@
 </div>
 
 <div id="canvas-container" data-project-id="<%= @project.id %>">
-  <%= render partial: 'canvas/full_zoom', locals: { experiment: @experiment, my_modules: @experiment.active_modules } %>
+  <%= render partial: 'canvas/full_zoom', locals: { experiment: @experiment, my_modules: @active_modules } %>
 </div>
 
 <!-- Manage tags modal -->
diff --git a/db/migrate/20171003082333_add_connections_and_sample_tasks_indexes.rb b/db/migrate/20171003082333_add_connections_and_sample_tasks_indexes.rb
new file mode 100644
index 000000000..29f1fb9a0
--- /dev/null
+++ b/db/migrate/20171003082333_add_connections_and_sample_tasks_indexes.rb
@@ -0,0 +1,7 @@
+class AddConnectionsAndSampleTasksIndexes < ActiveRecord::Migration
+  def change
+    add_index :connections, :input_id
+    add_index :connections, :output_id
+    add_index :sample_my_modules, :my_module_id
+  end
+end
diff --git a/db/migrate/20171003082333_add_indexes_to_connections.rb b/db/migrate/20171003082333_add_indexes_to_connections.rb
deleted file mode 100644
index 861ae4d40..000000000
--- a/db/migrate/20171003082333_add_indexes_to_connections.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddIndexesToConnections < ActiveRecord::Migration
-  def change
-    add_index :connections, :input_id
-    add_index :connections, :output_id
-  end
-end