diff --git a/app/controllers/spree/api/ams/countries_controller.rb b/app/controllers/spree/api/ams/countries_controller.rb
index 2dfad4a..c4cdd20 100644
--- a/app/controllers/spree/api/ams/countries_controller.rb
+++ b/app/controllers/spree/api/ams/countries_controller.rb
@@ -7,11 +7,18 @@ class CountriesController < Spree::Api::CountriesController
 
         # We don't need this paginated.
         def index
-          @countries = Country.accessible_by(current_ability, :read).order('name ASC')
+          @countries = Country.accessible_by(current_ability, :read)
+                              .includes(:states).order(:name)
+
+          isos = params[:isos]
+          isos = isos.split ',' if isos.is_a?(String)
+
+          @countries = @countries.where(iso: isos) if isos.present?
+
           respond_with @countries
         end
 
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/serializers/spree/state_serializer.rb b/app/serializers/spree/state_serializer.rb
index ec59f71..820c951 100644
--- a/app/serializers/spree/state_serializer.rb
+++ b/app/serializers/spree/state_serializer.rb
@@ -4,9 +4,8 @@ class StateSerializer < ActiveModel::Serializer
 
     attributes  :id,
                 :name,
-                :abbr
-
-    has_one :country, include: false
+                :abbr,
+                :country_id
 
   end
-end
\ No newline at end of file
+end