diff --git a/server.js b/server.js
index 3fb91f9..ea3ac94 100644
--- a/server.js
+++ b/server.js
@@ -12,6 +12,7 @@ var fs = require('fs');
 var LruCache = require('./lru-cache.js');
 var badge = require('./badge.js');
 var svg2img = require('./svg-to-img.js');
+var querystring = require('querystring');
 var serverSecrets;
 try {
   // Everything that cannot be checked in but is useful server-side
@@ -1547,18 +1548,14 @@ cache(function(data, match, sendBadge, request) {
     method: 'HEAD',
   };
   // Query Params
-  queryParams = [];
+  queryParams = {};
   if (branch) {
-    queryParams.push({name: 'branch', value: branch})
+    queryParams.branch = branch;
   }
   if (token) {
-    queryParams.push({name: 'token', value: token})
-  }
-  for (i = 0; i < queryParams.length; i++) {
-    var param = queryParams[i];
-    var sep = (i == 0 ? '?' : '&');
-    apiUrl.url += sep + param.name + '=' + param.value;
+    queryParams.token = token;
   }
+  apiUrl.url += '?' + querystring.stringify(queryParams);
   var badgeData = getBadgeData('coverage', data);
   request(apiUrl, function(err, res) {
     if (err != null) {