diff --git a/src/common/configuration/ConfigService.js b/src/common/configuration/ConfigService.js
index 52fa429d..471a39f4 100644
--- a/src/common/configuration/ConfigService.js
+++ b/src/common/configuration/ConfigService.js
@@ -87,7 +87,7 @@
         id: 0,
         proxy: '/proxy/?url=',
         nominatimUrl: 'http://nominatim.openstreetmap.org',
-        fileserviceUrlTemplate: '/api/fileservice/{}/view'
+        fileserviceUrlTemplate: '/api/fileservice/view/{}'
       };
 
       if (goog.isDefAndNotNull($window.config)) {
diff --git a/src/common/featuremanager/FeatureManagerService.js b/src/common/featuremanager/FeatureManagerService.js
index c69638ea..a06b09b0 100644
--- a/src/common/featuremanager/FeatureManagerService.js
+++ b/src/common/featuremanager/FeatureManagerService.js
@@ -115,7 +115,7 @@
 
         for (var i = 0; i < picStrings.length; i++) {
           var fileTokens = picStrings[i].split('.');
-          var ext = fileTokens.pop();
+          var ext = fileTokens.pop().split('/')[0]; // handle cases; /file.ext or /file.ext/endpoint
           if (supportedVideoFormats_.indexOf(ext) >= 0) {
             picStrings[i] = '/static/maploom/assets/media-default.png';
           }