diff --git a/helpers/libraries/errorHandlers.js b/helpers/libraries/errorHandlers.js
index 41326a35..61052194 100644
--- a/helpers/libraries/errorHandlers.js
+++ b/helpers/libraries/errorHandlers.js
@@ -1,11 +1,11 @@
 const logger = require('winston');
-const postToAnalytics = require('../helpers/libraries/analytics');
+const { postToAnalytics } = require('./analytics');
 
 module.exports = {
   handleRequestError (action, originalUrl, ip, error, res) {
     logger.error('Request Error >>', error);
     if (error === 'NO_CLAIMS' || error === 'NO_FREE_PUBLIC_CLAIMS') {
-      postToAnalytics(action, originalUrl, ip, 'success (no claims)');
+      postToAnalytics(action, originalUrl, ip, 'success');
       res.status(307).render('noClaims');
     } else if (error.response) {
       postToAnalytics(action, originalUrl, ip, 'error.response.data.error.messsage');
diff --git a/routes/api-routes.js b/routes/api-routes.js
index 6db79f53..20790dfa 100644
--- a/routes/api-routes.js
+++ b/routes/api-routes.js
@@ -5,7 +5,7 @@ const publishController = require('../controllers/publishController.js');
 const lbryApi = require('../helpers/libraries/lbryApi.js');
 const publishHelpers = require('../helpers/libraries/publishHelpers.js');
 const errorHandlers = require('../helpers/libraries/errorHandlers.js');
-const postToAnalytics = require('../helpers/libraries/analytics');
+const { postToAnalytics } = require('../helpers/libraries/analytics');
 
 module.exports = app => {
   // route to run a claim_list request on the daemon
diff --git a/routes/home-routes.js b/routes/home-routes.js
index ce79c7fe..1d747edf 100644
--- a/routes/home-routes.js
+++ b/routes/home-routes.js
@@ -1,5 +1,5 @@
 const logger = require('winston');
-const postToAnalytics = require('../helpers/libraries/analytics');
+const { postToAnalytics } = require('../helpers/libraries/analytics');
 
 module.exports = app => {
   // route for the home page
diff --git a/routes/serve-routes.js b/routes/serve-routes.js
index 32b66bb0..827054f6 100644
--- a/routes/serve-routes.js
+++ b/routes/serve-routes.js
@@ -1,7 +1,7 @@
 const errorHandlers = require('../helpers/libraries/errorHandlers.js');
 const serveController = require('../controllers/serveController.js');
 const logger = require('winston');
-const postToAnalytics = require('../helpers/libraries/analytics');
+const { postToAnalytics } = require('../helpers/libraries/analytics');
 
 function serveFile ({ fileName, fileType, filePath }, res) {
   logger.info(`serving file ${fileName}`);
@@ -38,9 +38,9 @@ module.exports = (app) => {
     logger.debug(`GET request on ${originalUrl} from ${ip}`);
     // begin image-serve processes
     serveController
-      .getClaimByClaimId('serve', params.name, params.claim_id)
+      .getClaimByClaimId(params.name, params.claim_id)
       .then(fileInfo => {
-        postToAnalytics(originalUrl, ip, 'success');
+        postToAnalytics('serve', originalUrl, ip, 'success');
         serveFile(fileInfo, res);
       })
       .catch(error => {
diff --git a/routes/show-routes.js b/routes/show-routes.js
index 14c87648..fa6c079f 100644
--- a/routes/show-routes.js
+++ b/routes/show-routes.js
@@ -1,7 +1,7 @@
 const errorHandlers = require('../helpers/libraries/errorHandlers.js');
 const showController = require('../controllers/showController.js');
 const logger = require('winston');
-const postToAnalytics = require('../helpers/libraries/analytics');
+const { postToAnalytics } = require('../helpers/libraries/analytics');
 
 module.exports = (app) => {
   // route to fetch all free public claims
diff --git a/routes/sockets-routes.js b/routes/sockets-routes.js
index c91163f0..b21c5ed9 100644
--- a/routes/sockets-routes.js
+++ b/routes/sockets-routes.js
@@ -2,7 +2,7 @@ const logger = require('winston');
 const publishController = require('../controllers/publishController.js');
 const publishHelpers = require('../helpers/libraries/publishHelpers.js');
 const errorHandlers = require('../helpers/libraries/errorHandlers.js');
-const postToAnalytics = require('../helpers/libraries/analytics');
+const { postToAnalytics } = require('../helpers/libraries/analytics');
 
 module.exports = (app, siofu, hostedContentPath) => {
   const http = require('http').Server(app);