diff --git a/app/services/dynamodb_query_service.rb b/app/services/dynamodb_query_service.rb
index b37116fefc..078cfb1784 100644
--- a/app/services/dynamodb_query_service.rb
+++ b/app/services/dynamodb_query_service.rb
@@ -1,9 +1,9 @@
 class DynamodbQueryService
   attr_accessor :data_query, :data_source, :options, :source_options, :current_user
 
-  def initialize(data_query, options, source_options, current_user)
+  def initialize(data_query, data_source, options, source_options, current_user)
     @data_query = data_query
-    @data_source = data_query.data_source
+    @data_source = data_source
     @options = options
     @source_options = source_options
     @current_user = current_user
diff --git a/app/services/elasticsearch_query_service.rb b/app/services/elasticsearch_query_service.rb
index 457e724407..f332d7ff9f 100644
--- a/app/services/elasticsearch_query_service.rb
+++ b/app/services/elasticsearch_query_service.rb
@@ -4,12 +4,12 @@ class ElasticsearchQueryService
 
   attr_accessor :data_query, :data_source, :options, :source_options, :current_user
 
-  def initialize(data_query, options, source_options, current_user)
+  def initialize(data_query, data_source, options, source_options, current_user)
     @data_query = data_query
     @options = options
     @source_options = source_options
     @current_user = current_user
-    @data_source = data_query.data_source
+    @data_source = data_source
   end
 
   def self.connection options
diff --git a/app/services/googlesheets_query_service.rb b/app/services/googlesheets_query_service.rb
index c03e6ce6cb..2b21234ee0 100644
--- a/app/services/googlesheets_query_service.rb
+++ b/app/services/googlesheets_query_service.rb
@@ -1,21 +1,21 @@
 class GooglesheetsQueryService
   attr_accessor :query, :source, :options, :source_options, :current_user
 
-  def initialize(data_query, options, source_options, current_user)
+  def initialize(data_query, data_source, options, source_options, current_user)
     @query = data_query
-    @source = query.data_source
+    @source = data_source
     @options = options
     @source_options = source_options
     @current_user = current_user
   end
 
   def process
-    operation = query.options['operation']
+    operation = options['operation']
     access_token = source_options['access_token']
     error = false
 
     if operation === 'info'
-      spreadsheet_id = query.options['spreadsheet_id']
+      spreadsheet_id = options['spreadsheet_id']
       result = get_spreadsheet_info(spreadsheet_id, access_token)
 
       if result.code === 401
@@ -29,8 +29,8 @@ class GooglesheetsQueryService
 
     if operation === 'append'
 
-      spreadsheet_id = query.options['spreadsheet_id']
-      sheet = query.options['sheet']
+      spreadsheet_id = options['spreadsheet_id']
+      sheet = options['sheet']
       rows = options['rows']
 
       result = append_data_to_sheet(spreadsheet_id, sheet, rows, access_token)
@@ -94,8 +94,8 @@ class GooglesheetsQueryService
     end
 
     def read_data(access_token)
-      spreadsheet_id = query.options['spreadsheet_id']
-      sheet = query.options['sheet']
+      spreadsheet_id = options['spreadsheet_id']
+      sheet = options['sheet']
 
       read_data_from_sheet(spreadsheet_id, sheet, access_token, 'A1:V101')
     end
diff --git a/app/services/mongodb_query_service.rb b/app/services/mongodb_query_service.rb
index 5413f5b2f1..0a4f44f628 100644
--- a/app/services/mongodb_query_service.rb
+++ b/app/services/mongodb_query_service.rb
@@ -1,9 +1,9 @@
 class MongodbQueryService
   attr_accessor :data_query, :data_source, :options, :source_options, :current_user
 
-  def initialize(data_query, options, source_options, current_user)
+  def initialize(data_query, data_source, options, source_options, current_user)
     @data_query = data_query
-    @data_source = data_query.data_source
+    @data_source = data_source
     @options = options
     @source_options = source_options
     @current_user = current_user
diff --git a/app/services/mysql_query_service.rb b/app/services/mysql_query_service.rb
index 981b54de60..30e95f9c8c 100644
--- a/app/services/mysql_query_service.rb
+++ b/app/services/mysql_query_service.rb
@@ -2,9 +2,9 @@ class MysqlQueryService
   include DatasourceUtils
   attr_accessor :data_query, :data_source, :options, :source_options, :current_user
 
-  def initialize(data_query, options, source_options, current_user)
+  def initialize(data_query, data_source, options, source_options, current_user)
     @data_query = data_query
-    @data_source = data_query.data_source
+    @data_source = data_source
     @options = options
     @source_options = source_options
     @current_user = current_user
diff --git a/app/services/restapi_query_service.rb b/app/services/restapi_query_service.rb
index fec596328e..9e931dd16e 100644
--- a/app/services/restapi_query_service.rb
+++ b/app/services/restapi_query_service.rb
@@ -1,12 +1,12 @@
 class RestapiQueryService
   attr_accessor :data_query, :options, :source_options, :current_user, :data_source
 
-  def initialize(data_query, options, source_options, current_user)
+  def initialize(data_query, data_source, options, source_options, current_user)
     @data_query = data_query
     @options = options
     @source_options = source_options
     @current_user = current_user
-    @data_source = data_query.data_source
+    @data_source = data_source
   end
 
   def process
diff --git a/app/services/slack_query_service.rb b/app/services/slack_query_service.rb
index 408e840f1a..a3fd928d97 100644
--- a/app/services/slack_query_service.rb
+++ b/app/services/slack_query_service.rb
@@ -1,16 +1,16 @@
 class SlackQueryService
   attr_accessor :query, :ource, :options, :source_options, :current_user
 
-  def initialize(data_query, options, source_options, current_user)
+  def initialize(data_query, data_source, options, source_options, current_user)
     @query = data_query
-    @source = query.data_source
+    @source = data_source
     @options = options
     @source_options = source_options
     @current_user = current_user
   end
 
   def process
-    operation = query.options['operation']
+    operation = options['operation']
     access_token = source_options['access_token']
     data = []
 
diff --git a/app/services/stripe_query_service.rb b/app/services/stripe_query_service.rb
index f7fa5d147e..f96f8f560b 100644
--- a/app/services/stripe_query_service.rb
+++ b/app/services/stripe_query_service.rb
@@ -1,9 +1,9 @@
 class StripeQueryService
   attr_accessor :data_query, :options, :data_source, :source_options, :current_user
 
-  def initialize(data_query, options, source_options, current_user)
+  def initialize(data_query, data_source, options, source_options, current_user)
     @data_query = data_query
-    @data_source = data_query.data_source
+    @data_source = data_source
     @options = options
     @source_options = source_options
     @current_user = current_user
@@ -20,15 +20,15 @@ class StripeQueryService
   def process
     stripe_api_key = source_options['api_key']
     api_base_url = 'https://api.stripe.com'
-    operation = data_query.options['operation']
-    path = data_query.options['path']
+    operation = options['operation']
+    path = options['path']
 
     url = "#{api_base_url}#{path}"
 
     # Replace path params in url with their values
     path_params = options['params']['path']
-    query_params = data_query.options['params']['query']
-    body_params = data_query.options['params']['request']
+    query_params = options['params']['query']
+    body_params = options['params']['request']
 
     url = replace_path_params(url, path_params)