     @createSwaggerRequestUrl = (swaggerCollection, swaggerRequestPath, queries) ->
       
         # Build swaggerRequestQueries
-        if queries.length > 0
-          swaggerRequestQueries = '?'
+        if Object.keys(queries).length > 0
+          swaggerRequestQueries = []
         
-        for query, index in queries
-          if index != queries.length - 1
-            swaggerRequestQueries = swaggerRequestQueries.concat "#{query}=value&"
-          else
-            swaggerRequestQueries = swaggerRequestQueries.concat "#{query}=value"
+        for key, value of queries
+          swaggerRequestQueries.push "#{key}=#{value}"
         
         swaggerRequestUrl = swaggerCollection.schemes[0] + '://' +
         swaggerCollection.host +

        # for index, swaggerRequestParamValue of swaggerRequestValue.parameters
        
        # Add Headers
        for header in headers
          pawRequest.setHeader header, "value"
        
        # # Set raw body
        # if postmanRequest["dataMode"] == "raw"

        else
          swaggerRequestTitle = swaggerRequestPath
          
        headers = {}
        queries = {}
        formData = []
        body = []
        
        # Extract contentType from Consumes and add the first one to Headers
        if swaggerRequestValue.consumes
          for contentType in swaggerRequestValue.consumes
            headers["Content-type"] = contentType
            break
                  
        # Extract Headers and Query params
        for index, swaggerRequestParamValue of swaggerRequestValue.parameters
          
          # Add Queries
          if swaggerRequestParamValue.in == 'query' and swaggerRequestParamValue.type == 'string'
            queries[swaggerRequestParamValue.name] = swaggerRequestParamValue.name 
                      
          # Add Headers
          if swaggerRequestParamValue.in == 'header' and swaggerRequestParamValue.type == 'string'
            headers[swaggerRequestParamValue.name] = ''
            
          # Add Url Encoded 
          if swaggerRequestParamValue.in == 'formData' and swaggerRequestParamValue.type == 'string'
