diff --git a/lib/action_controller/serialization.rb b/lib/action_controller/serialization.rb
index 21aaad48..99f860f5 100644
--- a/lib/action_controller/serialization.rb
+++ b/lib/action_controller/serialization.rb
@@ -63,7 +63,7 @@ module ActionController
     end
 
     def original_url
-      request.original_url.sub(/\?.*$/, "")
+      request.original_url[/\A[^?]+/]
     end
 
     def query_parameters
diff --git a/lib/active_model/serializer/adapter/json_api.rb b/lib/active_model/serializer/adapter/json_api.rb
index 02a0ff8f..ceb69487 100644
--- a/lib/active_model/serializer/adapter/json_api.rb
+++ b/lib/active_model/serializer/adapter/json_api.rb
@@ -20,7 +20,7 @@ module ActiveModel
           options ||= {}
           if serializer.respond_to?(:each)
             serializer.each do |s|
-              result = self.class.new(s, @options.merge(fieldset: @fieldset)).serializable_hash({})
+              result = self.class.new(s, @options.merge(fieldset: @fieldset)).serializable_hash(options)
               @hash[:data] << result[:data]
 
               if result[:included]
@@ -31,7 +31,7 @@ module ActiveModel
 
             add_links(options)
           else
-            @hash[:data] = attributes_for_serializer(serializer, {})
+            @hash[:data] = attributes_for_serializer(serializer, options)
             add_resource_relationships(@hash[:data], serializer)
           end
           @hash