1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/pokeviewer/pokemon_controller.rb b/app/controllers/pokeviewer/pokemon_controller.rb
index 86b0ea6..0e19c6a 100644
--- a/app/controllers/pokeviewer/pokemon_controller.rb
+++ b/app/controllers/pokeviewer/pokemon_controller.rb

@@ -3,12 +3,12 @@ require_dependency "pokeviewer/application_controller"
 module Pokeviewer
  class PokemonController < ApplicationController
    def index
-      pokemon = Pokemon.joins(:current).
+      pokemon = Pokemon.order("trainer_id IS NULL DESC").
-        order("trainer_id IS NULL DESC").
        order(trainer_id: :asc).
        order(box: :asc).
        order(slot: :asc).
-        group("pokeviewer_pokemon.uuid").
+        select(:uuid).distinct.
+        order("pokeviewer_revisions.sequential_id DESC").
        includes(:current).
        chunk do |p|
          if p.trainer_id.nil?