diff --git a/app/controllers/choices_controller.rb b/app/controllers/choices_controller.rb
index 565f7e0..7640ff3 100644
--- a/app/controllers/choices_controller.rb
+++ b/app/controllers/choices_controller.rb
@@ -5,11 +5,11 @@ class ChoicesController < InheritedResources::Base
   has_scope :active, :boolean => true, :only => :index
   
   def index
-    Choice.all.each {|c| c.compute_score!}
     if params[:limit]
       @question = Question.find(params[:question_id])#, :include => :choices)
       @question.reload
       @choices = Choice.find(:all, :conditions => {:question_id => @question.id}, :limit => params[:limit].to_i, :order => 'score DESC')
+      @choices.each {|c| c.compute_score!}
     else
       @question = Question.find(params[:question_id], :include => :choices) #eagerloads ALL choices
       @choices = @question.choices(true)
diff --git a/app/controllers/clicks_controller.rb b/app/controllers/clicks_controller.rb
index d4c3907..b696d66 100644
--- a/app/controllers/clicks_controller.rb
+++ b/app/controllers/clicks_controller.rb
@@ -2,7 +2,7 @@ class ClicksController < ApplicationController
   # GET /clicks
   # GET /clicks.xml
   def index
-    @clicks = Click.all
+    @clicks = Click.find(:all, :order => 'created_at DESC')
 
     respond_to do |format|
       format.html # index.html.erb
--
libgit2 0.21.2