diff --git a/docs/releases/v2.3.6.md b/docs/releases/v2.3.6.md
new file mode 100644
index 0000000000000000000000000000000000000000..4249e5ba896565f7ab2c6f3bac6e965ea3629201
--- /dev/null
+++ b/docs/releases/v2.3.6.md
@@ -0,0 +1,5 @@
+# v2.3.6
+
+## Bugfixes
+
+- fix backwards compatibility with some URLs
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index b151124d25ea7c9ce3327e7f283aa9f34a20dde6..0cfbc0842b4fdc0b01a32e4f5a9cac4fc8cd8a20 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -40,6 +40,7 @@ pages:
     - Fetching datasets: 'advanced/datasets.md'
     - Display non-atlas volumes: 'advanced/otherVolumes.md'
   - Release notes:
+    - v2.3.6: 'releases/v2.3.6.md'
     - v2.3.5: 'releases/v2.3.5.md'
     - v2.3.4: 'releases/v2.3.4.md'
     - v2.3.3: 'releases/v2.3.3.md'
diff --git a/src/ui/atlasLayerSelector/atlasLayerSelector.component.ts b/src/ui/atlasLayerSelector/atlasLayerSelector.component.ts
index 2ee14f1e192dfa35eee58ac0f168e7f8071c5461..5f98a274ce9cbf0b957dccdc2a66ad7d9dc6556b 100644
--- a/src/ui/atlasLayerSelector/atlasLayerSelector.component.ts
+++ b/src/ui/atlasLayerSelector/atlasLayerSelector.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChildren, QueryList, HostBinding } from "@angular/core";
 import { select, Store } from "@ngrx/store";
-import { distinctUntilChanged, map, withLatestFrom, shareReplay, groupBy, mergeMap, toArray, switchMap, scan, filter } from "rxjs/operators";
+import { distinctUntilChanged, map, withLatestFrom, shareReplay, groupBy, mergeMap, toArray, switchMap, scan, filter, startWith } from "rxjs/operators";
 import { Observable, Subscription, from, zip, of, combineLatest } from "rxjs";
 import { viewerStateSelectTemplateWithId, viewerStateToggleLayer } from "src/services/state/viewerState.store.helper";
 import { MatMenuTrigger } from "@angular/material/menu";
@@ -47,7 +47,9 @@ export class AtlasLayerSelector implements OnInit {
       )
 
       this.availableTemplates$ = this.store$.pipe(
-        select(viewerStateSelectedTemplateFullInfoSelector)
+        select(viewerStateSelectedTemplateFullInfoSelector),
+        map(v => v || []),
+        startWith<any[]>([])
       )
 
       this.selectedTemplate$ = this.store$.pipe(
@@ -91,16 +93,17 @@ export class AtlasLayerSelector implements OnInit {
             .filter(p => !p['groupName'])
             .filter(p => !p['baseLayer'])
         ),
+        startWith<any[]>([])
       )
 
-      this.groupedLayers$ = combineLatest(
+      this.groupedLayers$ = combineLatest([
         atlasLayersLatest$.pipe(
           map(allParcellations => 
             allParcellations.filter(p => !p['baseLayer'])
           ),
         ),
         layersGroupBy$
-      ).pipe(
+      ]).pipe(
         map(([ allParcellations, arr]) => arr
           .filter(([ key ]) => !!key )
           .map(([key, parcellations]) => ({
@@ -116,6 +119,7 @@ export class AtlasLayerSelector implements OnInit {
             })
           }))
         ),
+        startWith<any[]>([])
       )
     }