diff --git a/controllers/photos.rb b/controllers/photos.rb
index 5043cfa..548e0c1 100644
--- a/controllers/photos.rb
+++ b/controllers/photos.rb
@@ -283,10 +283,14 @@
 
 def load_related_photos
   @photo_ids = @photos.collect {|p| p.id}
-  @related_sets = PhotoPhotoset.all(:photo_id => @photo_ids, :fields => [:photoset_id], :unique => true).to_a.reject{|a| a.photoset.nil?}.sort_by!{|a| -a.photoset.num}
-  @related_tags = PhotoTag.all(:photo_id => @photo_ids, :fields => [:tag_id], :unique => true).to_a.reject{|a| a.tag.nil?}.sort_by!{|a| -a.tag.num}
-  @related_people = PersonPhoto.all(:photo_id => @photo_ids, :fields => [:person_id], :unique => true).to_a.reject{|a| a.person.nil?}.sort_by! {|a| -a.person.num}
-  @related_places = PhotoPlace.all(:photo_id => @photo_ids, :fields => [:place_id], :unique => true).to_a.reject{|a| a.place.nil?}.sort_by! {|a| -a.place.num}
+  @related_sets = Photoset.all(Photoset.photos.id => @photo_ids, :order => :num.desc)
+  @related_tags = Tag.all(Tag.photos.id => @photo_ids, :order => :num.desc)
+  @related_people = Person.all(Person.photos.id => @photo_ids, :order => :num.desc)
+  @related_places = Place.all(Place.photos.id => @photo_ids, :order => :num.desc)
+  # @related_sets = PhotoPhotoset.all(:photo_id => @photo_ids, :fields => [:photoset_id], :unique => true).to_a.reject{|a| a.photoset.nil?}.sort_by!{|a| -a.photoset.num}
+  # @related_tags = PhotoTag.all(:photo_id => @photo_ids, :fields => [:tag_id], :unique => true).to_a.reject{|a| a.tag.nil?}.sort_by!{|a| -a.tag.num}
+  # @related_people = PersonPhoto.all(:photo_id => @photo_ids, :fields => [:person_id], :unique => true).to_a.reject{|a| a.person.nil?}.sort_by! {|a| -a.person.num}
+  # @related_places = PhotoPlace.all(:photo_id => @photo_ids, :fields => [:place_id], :unique => true).to_a.reject{|a| a.place.nil?}.sort_by! {|a| -a.place.num}
   true
 end
 
diff --git a/views/photos/list.erb b/views/photos/list.erb
index 965a9fb..0aa942a 100644
--- a/views/photos/list.erb
+++ b/views/photos/list.erb
@@ -39,8 +39,8 @@
       <div class="sidebar-widget related">
         <h3><%= @related_titles[:sets] %></h3>
         <ul>
-          <% @related_sets.each do |link| next if !link.photoset %>
-            <li><a href="<%= link.photoset.page %>"><%= link.photoset.display_name %> <span class="num">(<%= link.photoset.num %>)</span></a></li>
+          <% @related_sets.each do |photoset| %>
+            <li><a href="<%= photoset.page %>"><%= photoset.display_name %> <span class="num">(<%= photoset.num %>)</span></a></li>
           <% end %>
         </ul>
       </div>    
@@ -50,8 +50,8 @@
       <div class="sidebar-widget related">
         <h3><%= @related_titles[:people] %></h3>
         <ul>
-          <% @related_people.each do |link| next if !link.person %>
-            <li><a href="<%= link.person.page %>"><%= link.person.display_name %></a> <span class="num">(<%= link.person.num %>)</span></li>
+          <% @related_people.each do |person| %>
+            <li><a href="<%= person.page %>"><%= person.display_name %></a> <span class="num">(<%= person.num %>)</span></li>
           <% end %>
         </ul>
       </div>    
@@ -61,8 +61,8 @@
       <div class="sidebar-widget related">
         <h3><%= @related_titles[:places] %></h3>
         <ul>
-          <% @related_places.each do |link| next if !link.place %>
-            <li><a href="<%= link.place.page %>"><%= link.place.display_name %></a> <span class="num">(<%= link.place.num %>)</span></li>
+          <% @related_places.each do |place| %>
+            <li><a href="<%= place.page %>"><%= place.display_name %></a> <span class="num">(<%= place.num %>)</span></li>
           <% end %>
         </ul>
       </div>    
@@ -89,8 +89,8 @@
       <div class="sidebar-widget related">
         <h3><%= @related_titles[:tags] %></h3>
         <ul>
-          <% @related_tags.each do |link| next if !link.tag %>
-            <li><a href="<%= link.tag.page %>"><%= link.tag.display_name %></a> <span class="num">(<%= link.tag.num %>)</span></li>
+          <% @related_tags.each do |tag| %>
+            <li><a href="<%= tag.page %>"><%= tag.display_name %></a> <span class="num">(<%= tag.num %>)</span></li>
           <% end %>
         </ul>
       </div>