     @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"

        swaggerRequestPath
        
        if swaggerRequestQueries
          swaggerRequestUrl = swaggerRequestUrl + '?' + swaggerRequestQueries.join('&')
        
        return swaggerRequestUrl
            
