diff --git a/app/controllers/guidance_groups_controller.rb b/app/controllers/guidance_groups_controller.rb
index dbd6622..7789d59 100644
--- a/app/controllers/guidance_groups_controller.rb
+++ b/app/controllers/guidance_groups_controller.rb
@@ -27,9 +27,9 @@
     @guidance_group = GuidanceGroup.new(params[:guidance_group])
     authorize @guidance_group
     @guidance_group.org_id = current_user.org_id
-      if params[:save_publish]
-          @guidance_group.published = true
-      end
+    if params[:save_publish]
+      @guidance_group.published = true
+    end
 
     respond_to do |format|
       if @guidance_group.save
diff --git a/app/controllers/guidances_controller.rb b/app/controllers/guidances_controller.rb
index da71a93..c1710fa 100644
--- a/app/controllers/guidances_controller.rb
+++ b/app/controllers/guidances_controller.rb
@@ -25,7 +25,7 @@
     authorize @guidance
 		@templates = Template.funders_and_own_templates(current_user.org_id)
 		@phases = nil
-		@templates.each do |template|
+		@templates.includes(:phases).each do |template|
 			if @phases.nil? then
 				@phases = template.phases.all.order('number')
 			else