diff --git a/app/controllers/analyze_controller.rb b/app/controllers/analyze_controller.rb
index b746d9c1..2f94ef39 100644
--- a/app/controllers/analyze_controller.rb
+++ b/app/controllers/analyze_controller.rb
@@ -1,7 +1,7 @@
 class AnalyzeController < SqmApplicationController
   def index
     @category ||= Category.find_by_category_id(params[:category])
-    @category ||= Category.first
+    @category ||= Category.order(:category_id).first
     @categories = Category.all.order(:category_id)
 
     @subcategories = @category.subcategories.order(:subcategory_id)
diff --git a/app/views/analyze/_grouped_bar_column.html.erb b/app/views/analyze/_grouped_bar_column.html.erb
index b066cfbb..4b3666e9 100644
--- a/app/views/analyze/_grouped_bar_column.html.erb
+++ b/app/views/analyze/_grouped_bar_column.html.erb
@@ -1,9 +1,11 @@
 <g id="grouped-bar-column">
-<rect x="<%= bar_label_x(presenter.position) - 2.5 %>%" y="<%= presenter.y_offset %>%" width="5%" height="<%= presenter.bar_height_percentage %>%" fill="#3E3A38" data-for-measure-id="<%= presenter.measure_id %>"/>
+  <rect x="<%= bar_label_x(presenter.position) - 2.5 %>%" y="<%= presenter.y_offset %>%" width="5%" height="<%= presenter.bar_height_percentage %>%" fill="#3E3A38" data-for-measure-id="<%= presenter.measure_id %>"/>
 
-  <text x="<%= bar_label_x(presenter.position) %>%" y="<%= 5 %>%" text-anchor="middle" dominant-baseline="middle" >
-    <%= presenter.score.average %>
-  </text>
+  <% if ENV["SCORES"].present?  && ENV["SCORES"].upcase == "SHOW" %>
+    <text x="<%= bar_label_x(presenter.position) %>%" y="<%= 5 %>%" text-anchor="middle" dominant-baseline="middle" >
+      <%= presenter.score.average %>
+    </text>
+  <% end %>
 
   <text class="graph-footer" x="<%= bar_label_x(presenter.position) %>%" y="<%= bar_label_height %>%" text-anchor="middle" dominant-baseline="middle" data-grouped-bar-label="<%= presenter.label %>">
     <%= presenter.label %>