diff --git a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html
index c8a8474..d71b381 100644
--- a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html
@@ -9,19 +9,19 @@
       <div class="legend-container" *ngIf="item?.data.layers;let layers">
         <div class="card menu-card">
           <div *ngIf="layers.length>1">
-            <select (change)="onLayerChanged($event.target.value)"  [value]="itemLayer.layerIndex">
+            <select (change)="onLayerChanged($event.target.value)"  [value]="selectedLayer">
               <option *ngFor="let l of layers;" [value]="l.index">{{l.name}}</option>
             </select>
           </div>
-          <fm-map-layer-legend [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
+          <fm-map-layer-legend [layer]="layer(layers,selectedLayer)" [histogramenabled]="true"></fm-map-layer-legend>
         </div>
       </div>
       <div class="card menu-card">
         <ul class="p-0 mt-2">
           <li *ngIf="item.isEditable"><a href="#" class="mt-1 mr-1" (click)="handleOnEdit(item)"><i class="fa fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
           <ng-container *ngIf="itemTypeService.isLayer(item)">
-            <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)"><i class="fa fa-eye" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li> 
-            <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fa fa-eye" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
+            <li *ngIf="!getItemLayer(item,selectedLayer)"><a   href="#" (click)="handleAddAsLayer(item,selectedLayer)"><i class="fa fa-eye" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li> 
+            <li *ngIf="getItemLayer(item,selectedLayer)"><a  href="#" (click)="handleRemoveLayer(item,selectedLayer)"><i class="fa fa-eye" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
           </ng-container>
         </ul>
       </div>
diff --git a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html
index 6ec9ebe..5257554 100644
--- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html
@@ -9,19 +9,19 @@
       <div class="legend-container" *ngIf="item?.data.layers;let layers">
         <div class="card menu-card">
           <div *ngIf="layers.length>1">
-            <select (change)="onLayerChanged($event.target.value)" [value]="itemLayer.layerIndex">
+            <select (change)="onLayerChanged($event.target.value)" [value]="selectedLayer">
               <option *ngFor="let l of layers;" [value]="l.index">{{l.name}}</option>
             </select>
           </div>
-          <fm-map-layer-legend [showTitle]="layers.length==1" [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
+          <fm-map-layer-legend [showTitle]="layers.length==1" [layer]="layer(layers,selectedLayer)" [histogramenabled]="true"></fm-map-layer-legend>
         </div>
       </div>
       <div class="card menu-card">
         <ul class="p-0 mt-2">
           <li *ngIf="item.isEditable"><a href="#" class="mt-1 mr-1" (click)="handleOnEdit(item)" ><i class="fa fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
           <ng-container *ngIf="itemTypeService.isLayer(item)">
-            <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" ><i class="fa fa-eye" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li> 
-            <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)" ><i class="fa fa-eye" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
+            <li *ngIf="!getItemLayer(item,selectedLayer)"><a   href="#" (click)="handleAddAsLayer(item,selectedLayer)" ><i class="fa fa-eye" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li> 
+            <li *ngIf="getItemLayer(item,selectedLayer)"><a  href="#" (click)="handleRemoveLayer(item,selectedLayer)" ><i class="fa fa-eye" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
           </ng-container>
         </ul>
       </div>
diff --git a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts
index daf0ef9..0a50645 100644
--- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts
+++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts
@@ -23,8 +23,10 @@ export class SelectedItemShapeComponent extends AbstractSelectedItemComponent {
   constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
     super(store, itemTypeService,location,router);
   }
+  public selectedLayer: number = 0;
   
   onLayerChanged(layerIndex: number) {
+    this.selectedLayer = layerIndex;
     this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
   }
   
diff --git a/src/configuration.json b/src/configuration.json
index c42dc6b..2241895 100644
--- a/src/configuration.json
+++ b/src/configuration.json
@@ -1,9 +1,9 @@
 {
-    "issuer": "https://accounts.farmmaps.awacc.nl",
+    "issuer": "https://accounts.farmmaps.awtest.nl",
     "clientId": "farmmapsdev",
-    "audience": "https://farmmaps.awacc.nl/",
+    "audience": "https://farmmaps.awtest.nl/",
     "requireHttps": true,
-    "apiEndPoint": "https://farmmaps.awacc.nl",
+    "apiEndPoint": "https://farmmaps.awtest.nl",
     "grantType":"code"
 }
   
\ No newline at end of file