diff --git a/api/dist/apihelp/apihelp.html b/api/dist/apihelp/apihelp.html
index 6087b9b20da3..ba761350ff61 100644
--- a/api/dist/apihelp/apihelp.html
+++ b/api/dist/apihelp/apihelp.html
@@ -137,7 +137,7 @@ <h2>A map with a subset of overlays</h2>
     div: 'map4',
     zoom: 0,
     center: [2590000, 1170000],
-    layers: ['ch.astra.hauptstrassennetz', 'polygon', 'point']
+    layers: ['ch.astra.hauptstrassennetz', 'polygon', 'point', 'group']
 });
                     </pre
         >
diff --git a/api/src/Themes.js b/api/src/Themes.js
index 2dd61cf6c8e1..1094216e5528 100644
--- a/api/src/Themes.js
+++ b/api/src/Themes.js
@@ -242,13 +242,17 @@ export function getOverlayLayers(layerNames) {
  * @hidden
  */
 export function createWMSLayer(config, ogcServer) {
+  let serverType = ogcServer.type;
+  // OpenLayers expects 'qgis' instead of 'qgisserver'
+  serverType = serverType.replace('qgisserver', 'qgis');
+
   const layer = new ImageLayer({
     source: new ImageWMS({
       url: ogcServer.url,
       params: {
         'LAYERS': config.layers,
       },
-      serverType: ogcServer.type,
+      serverType: serverType,
     }),
     minResolution: config.minResolutionHint,
     maxResolution: config.maxResolutionHint,
diff --git a/src/map/LayerHelper.js b/src/map/LayerHelper.js
index db2c8a6a4be2..73342f03951e 100644
--- a/src/map/LayerHelper.js
+++ b/src/map/LayerHelper.js
@@ -164,7 +164,7 @@ LayerHelper.prototype.createBasicWMSLayer = function (
   }
   if (opt_serverType) {
     params.SERVERTYPE = opt_serverType;
-    // OpenLayers expects 'qgis' insteads of 'qgisserver'
+    // OpenLayers expects 'qgis' instead of 'qgisserver'
     olServerType = opt_serverType.replace(ServerType.QGISSERVER, 'qgis');
   }