diff --git a/ruby/lib/jam_ruby/models/feed.rb b/ruby/lib/jam_ruby/models/feed.rb
index a3f751c3f..63520e1c8 100644
--- a/ruby/lib/jam_ruby/models/feed.rb
+++ b/ruby/lib/jam_ruby/models/feed.rb
@@ -39,11 +39,11 @@ module JamRuby
 
       # handle sort
       if sort == 'date'
-        query = query.order('feeds.active DESC, feeds.id DESC')
+        query = query.order('feeds.id DESC')
       elsif sort == 'plays'
-        query = query.order("feeds.active DESC, COALESCE(recordings.play_count, music_sessions.play_count) DESC")
+        query = query.order("COALESCE(recordings.play_count, music_sessions.play_count) DESC")
       elsif sort == 'likes'
-        query = query.order("feeds.active DESC, COALESCE(recordings.like_count, music_sessions.like_count) DESC")
+        query = query.order("COALESCE(recordings.like_count, music_sessions.like_count) DESC")
       else
         raise "sort not implemented: #{sort}"
       end
@@ -95,8 +95,8 @@ module JamRuby
         elsif sort == 'likes'
           query = query.group("COALESCE(recordings.like_count, music_sessions.like_count)")
         end
-        query = query.where('recordings.id is NULL OR claimed_recordings.is_public = TRUE')
-        query = query.where('music_sessions.id is NULL OR music_sessions_user_history.id IS NOT NULL')
+        query = query.where('feeds.recording_id is NULL OR claimed_recordings.is_public = TRUE')
+        query = query.where('feeds.music_session_id is NULL OR music_sessions_user_history.id IS NOT NULL')
       end
 
       current_page = params[:next_page].nil? ? 1 : params[:next_page].to_i