diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf6ad33550..4b08107be4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# [1.0.0-alpha.6](https://github.com/infra-geo-ouverte/igo2-lib/compare/1.0.0-alpha.5...1.0.0-alpha.6) (2019-08-15)
+
+
+### Bug Fixes
+
+* minors bugs ([f79de3d](https://github.com/infra-geo-ouverte/igo2-lib/commit/f79de3d))
+* **context-list:** dectect change ([ecf80c8](https://github.com/infra-geo-ouverte/igo2-lib/commit/ecf80c8))
+* **layer-list:** id missing ([7c801fe](https://github.com/infra-geo-ouverte/igo2-lib/commit/7c801fe))
+
+
+
 # [1.0.0-alpha.5](https://github.com/infra-geo-ouverte/igo2-lib/compare/1.0.0-alpha.4...1.0.0-alpha.5) (2019-08-13)
 
 
diff --git a/demo/src/app/app.module.ts b/demo/src/app/app.module.ts
index 5ec9a675b1..95f7d14188 100644
--- a/demo/src/app/app.module.ts
+++ b/demo/src/app/app.module.ts
@@ -1,7 +1,9 @@
-import { BrowserModule } from '@angular/platform-browser';
+import { BrowserModule, DomSanitizer } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NgModule } from '@angular/core';
+import {} from '@angular/platform-browser';
 import {
+  MatIconRegistry,
   MatSidenavModule,
   MatToolbarModule,
   MatButtonModule,
@@ -98,4 +100,12 @@ import { AppComponent } from './app.component';
   ],
   bootstrap: [AppComponent]
 })
-export class AppModule {}
+export class AppModule {
+  constructor(matIconRegistry: MatIconRegistry, domSanitizer: DomSanitizer) {
+    matIconRegistry.addSvgIconSet(
+      domSanitizer.bypassSecurityTrustResourceUrl(
+        './assets/igo2/core/icons/mdi.svg'
+      )
+    );
+  }
+}
diff --git a/demo/src/app/core/request/request.component.ts b/demo/src/app/core/request/request.component.ts
index bea9d97884..38e6bf492f 100644
--- a/demo/src/app/core/request/request.component.ts
+++ b/demo/src/app/core/request/request.component.ts
@@ -1,13 +1,16 @@
 import { Component } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 
+import { LanguageService } from '@igo2/core';
+
+
 @Component({
   selector: 'app-request',
   templateUrl: './request.component.html',
   styleUrls: ['./request.component.scss']
 })
 export class AppRequestComponent {
-  constructor(private http: HttpClient) {}
+  constructor(private http: HttpClient, public languageService: LanguageService) {}
 
   callHttp() {
     const url = '/locale/en.json';
diff --git a/demo/src/app/core/request/request.module.ts b/demo/src/app/core/request/request.module.ts
index 8911ff247e..2c1bc049d4 100644
--- a/demo/src/app/core/request/request.module.ts
+++ b/demo/src/app/core/request/request.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { HttpClientModule } from '@angular/common/http';
 import { MatCardModule, MatButtonModule } from '@angular/material';
 
-import { IgoLoggingModule, IgoErrorModule } from '@igo2/core';
+import { IgoErrorModule, IgoLanguageModule } from '@igo2/core';
 
 import { AppRequestComponent } from './request.component';
 import { AppRequestRoutingModule } from './request-routing.module';
@@ -14,6 +14,7 @@ import { AppRequestRoutingModule } from './request-routing.module';
     MatCardModule,
     MatButtonModule,
     HttpClientModule,
+    IgoLanguageModule.forRoot(),
     IgoErrorModule.forRoot() // Only if you want register errors from http call in console
     // IgoLoggingModule.forRoot() // Only if you want register http calls in console
   ],
diff --git a/demo/src/app/geo/directions/directions.component.ts b/demo/src/app/geo/directions/directions.component.ts
index b122ba6460..050ffd4354 100644
--- a/demo/src/app/geo/directions/directions.component.ts
+++ b/demo/src/app/geo/directions/directions.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 
 import { LanguageService } from '@igo2/core';
-import { IgoMap, LayerService } from '@igo2/geo';
+import { IgoMap, LayerService, MapService } from '@igo2/geo';
 
 @Component({
   selector: 'app-directions',
@@ -25,8 +25,10 @@ export class AppDirectionsComponent {
 
   constructor(
     private languageService: LanguageService,
-    private layerService: LayerService
+    private layerService: LayerService,
+    private mapService: MapService
   ) {
+    this.mapService.setMap(this.map);
     this.layerService
       .createAsyncLayer({
         title: 'Quebec Base Map',
diff --git a/demo/src/app/geo/feature/feature.module.ts b/demo/src/app/geo/feature/feature.module.ts
index d9467ea9da..63357442bc 100644
--- a/demo/src/app/geo/feature/feature.module.ts
+++ b/demo/src/app/geo/feature/feature.module.ts
@@ -6,7 +6,6 @@ import {
   MatIconModule
 } from '@angular/material';
 
-import { IgoCoreModule } from '@igo2/core';
 import { IgoPanelModule, IgoEntityTableModule } from '@igo2/common';
 import { IgoMapModule, IgoFeatureModule } from '@igo2/geo';
 
@@ -21,7 +20,6 @@ import { AppFeatureRoutingModule } from './feature-routing.module';
     MatCardModule,
     MatButtonModule,
     MatIconModule,
-    IgoCoreModule,
     IgoPanelModule,
     IgoEntityTableModule,
     IgoMapModule,
diff --git a/demo/src/app/geo/measure/measure.module.ts b/demo/src/app/geo/measure/measure.module.ts
index 5bd271012c..4145c4d3a5 100644
--- a/demo/src/app/geo/measure/measure.module.ts
+++ b/demo/src/app/geo/measure/measure.module.ts
@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core';
 import { MatCardModule } from '@angular/material';
 
-import { IgoCoreModule } from '@igo2/core';
 import { IgoMapModule, IgoMeasureModule } from '@igo2/geo';
 
 import { AppMeasureComponent } from './measure.component';
@@ -12,7 +11,6 @@ import { AppMeasureRoutingModule } from './measure-routing.module';
   imports: [
     AppMeasureRoutingModule,
     MatCardModule,
-    IgoCoreModule,
     IgoMapModule,
     IgoMeasureModule
   ],
diff --git a/demo/src/app/geo/search/search.component.html b/demo/src/app/geo/search/search.component.html
index 70872a528b..7b647ba35e 100644
--- a/demo/src/app/geo/search/search.component.html
+++ b/demo/src/app/geo/search/search.component.html
@@ -16,6 +16,7 @@
 
   <igo-panel title="Search">
     <igo-search-bar
+      [searchSettings]="true"
       (change)="onSearchTermChange($event)"
       (search)="onSearch($event)"
       (clearFeature)="removeFeatureFromMap()">
@@ -50,3 +51,5 @@
     [mode]="'context'">
   </igo-actionbar>
 </ng-template>
+
+<igo-message-center></igo-message-center>
diff --git a/demo/src/app/geo/search/search.module.ts b/demo/src/app/geo/search/search.module.ts
index 9db87568ee..e0d3812f91 100644
--- a/demo/src/app/geo/search/search.module.ts
+++ b/demo/src/app/geo/search/search.module.ts
@@ -8,11 +8,14 @@ import {
   MatTooltipModule
 } from '@angular/material';
 
+import { IgoMessageModule } from '@igo2/core';
+
 import {
   IgoPanelModule,
   IgoActionbarModule,
   IgoContextMenuModule
 } from '@igo2/common';
+
 import {
   IgoFeatureModule,
   IgoMapModule,
@@ -38,6 +41,7 @@ import { AppSearchRoutingModule } from './search-routing.module';
     MatButtonModule,
     MatIconModule,
     MatTooltipModule,
+    IgoMessageModule.forRoot(),
     IgoPanelModule,
     IgoMapModule,
     IgoSearchModule.forRoot(),
diff --git a/demo/src/contexts/_base.json b/demo/src/contexts/_base.json
new file mode 100644
index 0000000000..83ade12316
--- /dev/null
+++ b/demo/src/contexts/_base.json
@@ -0,0 +1,17 @@
+{
+  "map": {
+    "view": {
+      "projection": "EPSG:3857",
+      "center": [-72, 50],
+      "zoom": 8
+    }
+  },
+  "layers": [
+    {
+      "title": "OSM",
+      "sourceOptions": {
+        "type": "osm"
+      }
+    }
+  ]
+}
diff --git a/demo/src/contexts/_default.json b/demo/src/contexts/_default.json
index 2c73fb2d19..e806d8d3db 100644
--- a/demo/src/contexts/_default.json
+++ b/demo/src/contexts/_default.json
@@ -1,20 +1,7 @@
 {
   "uri": "_default",
-  "title": "Default Context",
-  "map": {
-    "view": {
-      "projection": "EPSG:3857",
-      "center": [-72, 50],
-      "zoom": 8
-    }
-  },
+  "base": "_base",
   "layers": [
-    {
-      "title": "OSM",
-      "sourceOptions": {
-        "type": "osm"
-      }
-    },
     {
       "sourceOptions": {
         "type": "wms",
diff --git a/demo/src/contexts/context2.json b/demo/src/contexts/context2.json
index d7c0984804..1d3673bbf3 100644
--- a/demo/src/contexts/context2.json
+++ b/demo/src/contexts/context2.json
@@ -1,6 +1,5 @@
 {
   "uri": "context2",
-  "title": "Context 2",
   "map": {
     "view": {
       "projection": "EPSG:3857",
diff --git a/demo/src/contexts/context3.json b/demo/src/contexts/context3.json
index 3296d73d98..030cbca77e 100644
--- a/demo/src/contexts/context3.json
+++ b/demo/src/contexts/context3.json
@@ -1,6 +1,5 @@
 {
   "uri": "context3",
-  "title": "CARTO examples",
   "map": {
     "view": {
       "projection": "EPSG:3857",
diff --git a/demo/src/contexts/context4.json b/demo/src/contexts/context4.json
index e2d0b0ac88..a7826da483 100644
--- a/demo/src/contexts/context4.json
+++ b/demo/src/contexts/context4.json
@@ -1,6 +1,5 @@
 {
   "uri": "context4",
-  "title": "ArcGIS / TileArcGIS Rest examples ",
   "map": {
     "view": {
       "projection": "EPSG:3857",
diff --git a/demo/src/environments/environment.ts b/demo/src/environments/environment.ts
index e5af44ae8d..6fcae8266d 100644
--- a/demo/src/environments/environment.ts
+++ b/demo/src/environments/environment.ts
@@ -65,40 +65,28 @@ export const environment: Environment = {
     },
     searchSources: {
       nominatim: {
-        enabled: false,
-        disabled: true
-      },
-      reseautq: {
-        searchUrl: 'https://ws.mapserver.transports.gouv.qc.ca/swtq',
-        locateUrl: 'https://ws.mapserver.transports.gouv.qc.ca/swtq',
-        limit: 5,
-        locateLimit: 15,
-        zoomMaxOnSelect: 8,
-        enabled: false,
-        propertiesAlias: [
-          { name: 'title', alias: 'Titre' },
-          { name: 'etiquette', alias: 'Informations' },
-          { name: 'nommun', alias: 'Municipalité' },
-          { name: 'messagpan', alias: 'Message' },
-          { name: 'noroute', alias: '# de route' },
-        { name: 'nosortie', alias: '# de sortie' },
-          { name: 'direction', alias: 'Direction' },
-          { name: 'typesort', alias: 'Type de sortie' }
-        ],
-        distance: 0.5
+        enabled: true
       },
       icherche: {
         searchUrl: '/apis/icherche/geocode',
-        zoomMaxOnSelect: 10,
-        enabled: true
+        order: 2,
+        enabled: true,
+        params: {
+          limit: '8'
+        }
       },
       icherchereverse: {
         searchUrl: '/apis/territoires/locate',
+        order: 3,
         enabled: true
       },
       ilayer: {
         searchUrl: '/apis/layers/search',
-        enabled: true
+        order: 4,
+        enabled: true,
+        params: {
+          limit: '5'
+        }
       }
     }
   }
diff --git a/package-lock.json b/package-lock.json
index b142535368..a19bfdcf87 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo/demo",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1552,7 +1552,7 @@
     },
     "acorn-globals": {
       "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz",
+      "resolved": "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz",
       "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
       "requires": {
         "acorn": "^2.1.0"
@@ -1721,7 +1721,7 @@
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
           "dev": true,
           "requires": {
             "is-fullwidth-code-point": "^2.0.0",
@@ -1865,7 +1865,7 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=",
       "dev": true
     },
     "archy": {
@@ -1917,7 +1917,7 @@
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
       "dev": true
     },
     "arr-map": {
@@ -1949,7 +1949,7 @@
     },
     "array-equal": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+      "resolved": "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
       "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
     },
     "array-filter": {
@@ -2453,7 +2453,7 @@
     "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
       "dev": true,
       "requires": {
         "cache-base": "^1.0.1",
@@ -2654,7 +2654,7 @@
     "bn.js": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
       "dev": true
     },
     "body-parser": {
@@ -3001,7 +3001,7 @@
     "buffer-indexof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
+      "integrity": "sha1-Uvq8xqYG0aADAoAmSO9o9jnaJow=",
       "dev": true
     },
     "buffer-xor": {
@@ -3058,7 +3058,7 @@
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
       "dev": true,
       "requires": {
         "collection-visit": "^1.0.0",
@@ -3263,7 +3263,7 @@
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
       "dev": true,
       "requires": {
         "inherits": "^2.0.1",
@@ -3687,7 +3687,7 @@
     "content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
       "dev": true
     },
     "conventional-changelog": {
@@ -4436,7 +4436,7 @@
     "copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "integrity": "sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=",
       "dev": true,
       "requires": {
         "aproba": "^1.1.1",
@@ -5662,7 +5662,7 @@
     "evp_bytestokey": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
       "dev": true,
       "requires": {
         "md5.js": "^1.3.4",
@@ -6952,7 +6952,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
       "dev": true
     },
     "gauge": {
@@ -7533,7 +7533,7 @@
     "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
       "dev": true
     },
     "globby": {
@@ -8808,7 +8808,7 @@
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
       "dev": true,
       "requires": {
         "isobject": "^3.0.1"
@@ -9317,7 +9317,7 @@
     },
     "jsdom": {
       "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-8.5.0.tgz",
+      "resolved": "http://registry.npmjs.org/jsdom/-/jsdom-8.5.0.tgz",
       "integrity": "sha1-1Nj12/J2hjW2KmKCO5R89wcevJg=",
       "requires": {
         "abab": "^1.0.0",
@@ -10478,7 +10478,7 @@
     "miller-rabin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
       "dev": true,
       "requires": {
         "bn.js": "^4.0.0",
@@ -10542,7 +10542,7 @@
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
       "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
@@ -11296,7 +11296,7 @@
     "npmlog": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
       "dev": true,
       "requires": {
         "are-we-there-yet": "~1.1.2",
@@ -11686,7 +11686,7 @@
     "p-map": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "integrity": "sha1-5OlPMR6rvIYzoeeZCBZfyiYkG2s=",
       "dev": true
     },
     "p-try": {
@@ -12036,7 +12036,7 @@
     },
     "pause-stream": {
       "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
       "dev": true,
       "requires": {
@@ -12046,7 +12046,7 @@
     "pbf": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.1.0.tgz",
-      "integrity": "sha512-/hYJmIsTmh7fMkHAWWXJ5b8IKLWdjdlAFb3IHkRBn1XUhIYBChVGfVwmHEAV3UfXTxsP/AKfYTXTS/dCPxJd5w==",
+      "integrity": "sha1-9wAEutyygXYeq7HnbJLxefCBiek=",
       "requires": {
         "ieee754": "^1.1.6",
         "resolve-protobuf-schema": "^2.0.0"
@@ -12514,7 +12514,7 @@
     "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -13272,7 +13272,7 @@
     "replacestream": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz",
-      "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==",
+      "integrity": "sha1-PuV5gJK+Nksc2xSEMISSyz3/LzY=",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^1.0.3",
@@ -14216,7 +14216,7 @@
     "snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
       "dev": true,
       "requires": {
         "define-property": "^1.0.0",
@@ -14267,7 +14267,7 @@
     "snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
       "dev": true,
       "requires": {
         "kind-of": "^3.2.0"
@@ -16237,7 +16237,7 @@
     "vlq": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.3.tgz",
-      "integrity": "sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==",
+      "integrity": "sha1-jz5DKM9jsVQMDWfhsneDhviXWyY=",
       "dev": true
     },
     "vm-browserify": {
diff --git a/package.json b/package.json
index 647f43ad83..b82377e285 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo/demo",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "description": "IGO Library",
   "author": "MSP",
   "license": "MIT",
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 33ec7692d9..6beedf2f1b 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/auth",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "description": "IGO Library",
   "author": "MSP",
   "keywords": ["igo"],
@@ -22,8 +22,8 @@
     "@angular/core": "^7.2.6",
     "@angular/forms": "^7.2.6",
     "@angular/material": "^7.3.3",
-    "@igo2/core": "^1.0.0-alpha.5",
-    "@igo2/utils": "^1.0.0-alpha.5",
+    "@igo2/core": "^1.0.0-alpha.6",
+    "@igo2/utils": "^1.0.0-alpha.6",
     "rxjs": "^6.4.0"
   }
 }
\ No newline at end of file
diff --git a/packages/common/package.json b/packages/common/package.json
index 72a66dd5b7..da7fec9963 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/common",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "description": "IGO Library",
   "author": "MSP",
   "keywords": ["igo"],
@@ -17,8 +17,8 @@
     "@angular/common": "^7.2.6",
     "@angular/core": "^7.2.6",
     "@angular/material": "^7.3.3",
-    "@igo2/core": "^1.0.0-alpha.5",
-    "@igo2/utils": "^1.0.0-alpha.5",
+    "@igo2/core": "^1.0.0-alpha.6",
+    "@igo2/utils": "^1.0.0-alpha.6",
     "typy": "^2.0.1"
   }
 }
\ No newline at end of file
diff --git a/packages/common/src/lib/form/form/form.component.html b/packages/common/src/lib/form/form/form.component.html
index 10dcab580e..79d346895c 100644
--- a/packages/common/src/lib/form/form/form.component.html
+++ b/packages/common/src/lib/form/form/form.component.html
@@ -1,5 +1,6 @@
 
 <form
+  [autocomplete]="autocomplete"
   [formGroup]="form.control"
   (ngSubmit)="onSubmit()">
   <div class="igo-form-body" [ngClass]="{'igo-form-body-with-buttons': hasButtons}">
diff --git a/packages/common/src/lib/form/form/form.component.ts b/packages/common/src/lib/form/form/form.component.ts
index cb673c3d72..2031c8f846 100644
--- a/packages/common/src/lib/form/form/form.component.ts
+++ b/packages/common/src/lib/form/form/form.component.ts
@@ -36,6 +36,11 @@ export class FormComponent implements OnChanges {
    */
   @Input() formData: { [key: string]: any};
 
+  /**
+   * Form autocomplete
+   */
+  @Input() autocomplete: string = 'off';
+
   /**
    * Event emitted when the form is submitted
    */
diff --git a/packages/common/src/lib/workspace/shared/workspace.ts b/packages/common/src/lib/workspace/shared/workspace.ts
index 3db3a8b4aa..d10ec48fef 100644
--- a/packages/common/src/lib/workspace/shared/workspace.ts
+++ b/packages/common/src/lib/workspace/shared/workspace.ts
@@ -3,7 +3,7 @@ import { debounceTime } from 'rxjs/operators';
 
 import { ActionStore } from '../../action';
 import { Widget } from '../../widget';
-import { EntityRecord, EntityStore } from '../../entity';
+import { EntityStore } from '../../entity';
 
 import { WorkspaceOptions } from './workspace.interfaces';
 
@@ -110,7 +110,7 @@ export class Workspace<E extends object = object> {
     if (this.actionStore !== undefined) {
       this.change$ = this.change
         .pipe(debounceTime(35))
-        .subscribe(() => this.actionStore.updateActionsAvailability());
+        .subscribe(() => this.updateActionsAvailability());
     }
 
     this.change.next();
@@ -157,6 +157,12 @@ export class Workspace<E extends object = object> {
     this.change.next();
   }
 
+  updateActionsAvailability() {
+    if (this.actionStore !== undefined) {
+      this.actionStore.updateActionsAvailability();
+    }
+  }
+
   /**
    * When the state changes, update the actions availability.
    */
diff --git a/packages/context/package.json b/packages/context/package.json
index 0a99794874..c72b2ae13c 100644
--- a/packages/context/package.json
+++ b/packages/context/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/context",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "description": "IGO Library",
   "author": "MSP",
   "keywords": ["igo"],
@@ -19,11 +19,11 @@
     "@angular/core": "^7.2.6",
     "@angular/forms": "^7.2.6",
     "@angular/material": "^7.3.3",
-    "@igo2/auth": "^1.0.0-alpha.5",
-    "@igo2/common": "^1.0.0-alpha.5",
-    "@igo2/core": "^1.0.0-alpha.5",
-    "@igo2/utils": "^1.0.0-alpha.5",
-    "@igo2/geo": "^1.0.0-alpha.5",
+    "@igo2/auth": "^1.0.0-alpha.6",
+    "@igo2/common": "^1.0.0-alpha.6",
+    "@igo2/core": "^1.0.0-alpha.6",
+    "@igo2/utils": "^1.0.0-alpha.6",
+    "@igo2/geo": "^1.0.0-alpha.6",
     "ol": "^5.3.0",
     "rxjs": "^6.4.0"
   }
diff --git a/packages/context/src/lib/context-manager/context-list/context-list.component.ts b/packages/context/src/lib/context-manager/context-list/context-list.component.ts
index ff1deac422..0ae4e7b946 100644
--- a/packages/context/src/lib/context-manager/context-list/context-list.component.ts
+++ b/packages/context/src/lib/context-manager/context-list/context-list.component.ts
@@ -19,6 +19,7 @@ export class ContextListComponent {
   }
   set contexts(value: ContextsList) {
     this._contexts = value;
+    this.cdRef.detectChanges();
   }
   private _contexts: ContextsList = { ours: [] };
 
diff --git a/packages/context/src/lib/context-manager/shared/context.interface.ts b/packages/context/src/lib/context-manager/shared/context.interface.ts
index acc5af1d8e..767222d8b6 100644
--- a/packages/context/src/lib/context-manager/shared/context.interface.ts
+++ b/packages/context/src/lib/context-manager/shared/context.interface.ts
@@ -21,6 +21,7 @@ export interface ContextsList {
 }
 
 export interface DetailedContext extends Context {
+  base?: string;
   map?: ContextMap;
   layers?: LayerOptions[];
   tools?: Tool[];
diff --git a/packages/context/src/lib/context-manager/shared/context.service.ts b/packages/context/src/lib/context-manager/shared/context.service.ts
index 5d346405eb..77eddde781 100644
--- a/packages/context/src/lib/context-manager/shared/context.service.ts
+++ b/packages/context/src/lib/context-manager/shared/context.service.ts
@@ -1,13 +1,13 @@
 import { Injectable, Optional } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 
-import { BehaviorSubject, Observable } from 'rxjs';
-import { map, tap, catchError, debounceTime } from 'rxjs/operators';
+import { BehaviorSubject, Observable, of } from 'rxjs';
+import { map, tap, catchError, debounceTime, flatMap } from 'rxjs/operators';
 
 import olPoint from 'ol/geom/Point';
 
 import { Tool } from '@igo2/common';
-import { uuid } from '@igo2/utils';
+import { uuid, ObjectUtils } from '@igo2/utils';
 import {
   ConfigService,
   RouteService,
@@ -214,9 +214,33 @@ export class ContextService {
     );
   }
 
-  getLocalContext(uri): Observable<DetailedContext> {
+  getLocalContext(uri: string): Observable<DetailedContext> {
     const url = this.getPath(`${uri}.json`);
     return this.http.get<DetailedContext>(url).pipe(
+      flatMap((res) => {
+        if (!res.base) {
+          return of(res);
+        }
+        const urlBase = this.getPath(`${res.base}.json`);
+        return this.http.get<DetailedContext>(urlBase).pipe(
+          map((resBase: DetailedContext) => {
+            const resMerge = res;
+            resMerge.map = ObjectUtils.mergeDeep(resBase.map, res.map);
+            resMerge.layers = (resBase.layers || []).concat((res.layers || [])).reverse()
+              .filter((l, index, self) => !l.id || self.findIndex((l2) => l2.id === l.id) === index)
+              .reverse();
+            resMerge.toolbar = [...new Set(
+              (resBase.toolbar || []).concat((res.toolbar || [])).reverse()) as any
+            ].reverse();
+            resMerge.tools = (res.tools || []).concat((resBase.tools || []))
+              .filter((t, index, self) => self.findIndex((t2) => t2.name === t.name) === index);
+            return resMerge;
+          }),
+          catchError(res => {
+            return this.handleError(res, uri);
+          })
+        );
+      }),
       catchError(res => {
         return this.handleError(res, uri);
       })
diff --git a/packages/core/package.json b/packages/core/package.json
index fc67ece161..6d97056353 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/core",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "description": "IGO Library",
   "author": "MSP",
   "keywords": ["igo"],
@@ -21,7 +21,7 @@
     "@angular/common": "^7.2.6",
     "@angular/core": "^7.2.6",
     "@angular/cdk": "^7.3.3",
-    "@igo2/utils": "^1.0.0-alpha.5",
+    "@igo2/utils": "^1.0.0-alpha.6",
     "rxjs": "^6.4.0"
   }
 }
\ No newline at end of file
diff --git a/packages/core/src/lib/network/index.ts b/packages/core/src/lib/network/index.ts
index f63df1f3b7..0ec10b301a 100644
--- a/packages/core/src/lib/network/index.ts
+++ b/packages/core/src/lib/network/index.ts
@@ -1,2 +1 @@
 export * from './network.service';
-export * from './network.module';
diff --git a/packages/core/src/lib/network/network.module.ts b/packages/core/src/lib/network/network.module.ts
deleted file mode 100644
index 275264dc3c..0000000000
--- a/packages/core/src/lib/network/network.module.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { NetworkService } from './network.service';
-
-@NgModule({
-  declarations: [],
-  imports: [CommonModule],
-  providers: [NetworkService]
-})
-export class NetworkModule { }
diff --git a/packages/core/src/lib/network/network.service.ts b/packages/core/src/lib/network/network.service.ts
index 9539e45a19..e5074ef3e1 100644
--- a/packages/core/src/lib/network/network.service.ts
+++ b/packages/core/src/lib/network/network.service.ts
@@ -2,7 +2,7 @@ import { Injectable, EventEmitter, OnDestroy, Injector } from '@angular/core';
 import { Observable, Subscription, fromEvent } from 'rxjs';
 import { debounceTime, startWith } from 'rxjs/operators';
 
-import { MessageService } from '../message';
+import { MessageService } from '../message/shared/message.service';
 import { LanguageService } from '../language/shared/language.service';
 
 export interface ConnectionState {
diff --git a/packages/core/src/lib/request/error.interceptor.ts b/packages/core/src/lib/request/error.interceptor.ts
index 1d2f8052b4..2413cd7802 100644
--- a/packages/core/src/lib/request/error.interceptor.ts
+++ b/packages/core/src/lib/request/error.interceptor.ts
@@ -13,10 +13,10 @@ import { catchError, finalize } from 'rxjs/operators';
 import { MessageService } from '../message/shared/message.service';
 import { LanguageService } from '../language/shared/language.service';
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class ErrorInterceptor implements HttpInterceptor {
-  private httpError: HttpErrorResponse;
-
   constructor(
     private messageService: MessageService,
     private injector: Injector
@@ -26,25 +26,26 @@ export class ErrorInterceptor implements HttpInterceptor {
     req: HttpRequest<any>,
     next: HttpHandler
   ): Observable<HttpEvent<any>> {
+    const errorContainer = { httpError: undefined };
     return next.handle(req).pipe(
-      catchError(error => this.handleError(error, req)),
-      finalize(() => this.handleCaughtError()),
-      finalize(() => this.handleUncaughtError())
+      catchError(error => this.handleError(error, errorContainer)),
+      finalize(() => {
+        this.handleCaughtError(errorContainer);
+        this.handleUncaughtError(errorContainer);
+      })
     );
   }
 
-  private handleError(httpError: HttpErrorResponse, req: HttpRequest<any>) {
-    const msg = `${req.method} ${req.urlWithParams} ${httpError.status} (${
-      httpError.statusText
-    })`;
-
+  private handleError(
+    httpError: HttpErrorResponse,
+    errorContainer: { httpError: HttpErrorResponse }
+  ) {
     if (httpError instanceof HttpErrorResponse) {
       const errorObj = httpError.error === 'object' ? httpError.error : {};
       errorObj.message = httpError.error.message || httpError.statusText;
       errorObj.caught = false;
-      console.error(msg, '\n', errorObj.message, '\n\n', httpError);
 
-      this.httpError = new HttpErrorResponse({
+      httpError = new HttpErrorResponse({
         error: errorObj,
         headers: httpError.headers,
         status: httpError.status,
@@ -53,25 +54,27 @@ export class ErrorInterceptor implements HttpInterceptor {
       });
     }
 
-    return throwError(this.httpError);
+    errorContainer.httpError = httpError;
+    return throwError(httpError);
   }
 
-  private handleCaughtError() {
-    if (this.httpError && this.httpError.error.toDisplay) {
-      this.httpError.error.caught = true;
-      this.messageService.error(
-        this.httpError.error.message,
-        this.httpError.error.title
-      );
+  private handleCaughtError(errorContainer: { httpError: HttpErrorResponse }) {
+    const httpError = errorContainer.httpError;
+    if (httpError && httpError.error.toDisplay) {
+      httpError.error.caught = true;
+      this.messageService.error(httpError.error.message, httpError.error.title);
     }
   }
 
-  private handleUncaughtError() {
-    if (this.httpError && !this.httpError.error.caught) {
+  private handleUncaughtError(errorContainer: {
+    httpError: HttpErrorResponse;
+  }) {
+    const httpError = errorContainer.httpError;
+    if (httpError && !httpError.error.caught) {
       const translate = this.injector.get(LanguageService).translate;
       const message = translate.instant('igo.core.errors.uncaught.message');
       const title = translate.instant('igo.core.errors.uncaught.title');
-      this.httpError.error.caught = true;
+      httpError.error.caught = true;
       this.messageService.error(message, title);
     }
   }
diff --git a/packages/core/src/lib/request/error.module.ts b/packages/core/src/lib/request/error.module.ts
index a94a35f6ad..9e34903870 100644
--- a/packages/core/src/lib/request/error.module.ts
+++ b/packages/core/src/lib/request/error.module.ts
@@ -1,4 +1,9 @@
-import { NgModule, ModuleWithProviders } from '@angular/core';
+import {
+  NgModule,
+  ModuleWithProviders,
+  Optional,
+  SkipSelf
+} from '@angular/core';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
 
 import { ErrorInterceptor } from './error.interceptor';
@@ -21,4 +26,12 @@ export class IgoErrorModule {
       ]
     };
   }
+
+  constructor(@Optional() @SkipSelf() parentModule: IgoErrorModule) {
+    if (parentModule) {
+      throw new Error(
+        'IgoErrorModule is already loaded. Import it in the AppModule only'
+      );
+    }
+  }
 }
diff --git a/packages/geo/package.json b/packages/geo/package.json
index 3b09fdb136..dac93157cf 100644
--- a/packages/geo/package.json
+++ b/packages/geo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "description": "IGO Library",
   "author": "MSP",
   "keywords": ["igo"],
@@ -24,9 +24,9 @@
     "@angular/core": "^7.2.6",
     "@angular/forms": "^7.2.6",
     "@angular/material": "^7.3.3",
-    "@igo2/common": "^1.0.0-alpha.5",
-    "@igo2/core": "^1.0.0-alpha.5",
-    "@igo2/utils": "^1.0.0-alpha.5",
+    "@igo2/common": "^1.0.0-alpha.6",
+    "@igo2/core": "^1.0.0-alpha.6",
+    "@igo2/utils": "^1.0.0-alpha.6",
     "ol": "^5.3.0",
     "proj4": "^2.5.0",
     "rxjs": "^6.4.0"
diff --git a/packages/geo/src/lib/catalog/shared/catalog.service.ts b/packages/geo/src/lib/catalog/shared/catalog.service.ts
index f02e82fb00..8289b948e9 100644
--- a/packages/geo/src/lib/catalog/shared/catalog.service.ts
+++ b/packages/geo/src/lib/catalog/shared/catalog.service.ts
@@ -3,6 +3,7 @@ import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { EMPTY, Observable, of, concat } from 'rxjs';
 import { map, catchError } from 'rxjs/operators';
 
+import { uuid } from '@igo2/utils';
 import { LanguageService, ConfigService } from '@igo2/core';
 import {
   CapabilitiesService,
@@ -40,36 +41,41 @@ export class CatalogService {
     const apiUrl = catalogConfig.url || contextConfig.url;
     const catalogsFromConfig = catalogConfig.sources || [];
 
-    if (apiUrl === undefined) {
-      return of(catalogsFromConfig);
-    }
-
     const observables$ = [];
 
-    // Base layers catalog
-    if (catalogConfig.baseLayers) {
-      const translate = this.languageService.translate;
-      const title = translate.instant('igo.geo.catalog.baseLayers');
-      const baseLayersCatalog = {
-        id: 'catalog.baselayers',
-        title,
-        url: `${apiUrl}/baselayers`,
-        type: 'baselayers'
-      };
-      observables$.push(of(baseLayersCatalog));
-    }
+    if (apiUrl) {
+      // Base layers catalog
+      if (catalogConfig.baseLayers) {
+        const translate = this.languageService.translate;
+        const title = translate.instant('igo.geo.catalog.baseLayers');
+        const baseLayersCatalog = {
+          id: 'catalog.baselayers',
+          title,
+          url: `${apiUrl}/baselayers`,
+          type: 'baselayers'
+        };
+        observables$.push(of(baseLayersCatalog));
+      }
 
-    // Catalogs from API
-    const catalogsFromApi$ = this.http
-      .get<Catalog[]>(`${apiUrl}/catalogs`)
-      .pipe(
-        catchError((response: HttpErrorResponse) => EMPTY)
-      );
-    observables$.push(catalogsFromApi$);
+      // Catalogs from API
+      const catalogsFromApi$ = this.http
+        .get<Catalog[]>(`${apiUrl}/catalogs`)
+        .pipe(
+          catchError((response: HttpErrorResponse) => EMPTY)
+        );
+      observables$.push(catalogsFromApi$);
+    }
 
     // Catalogs from config
     if (catalogsFromConfig.length > 0) {
-      observables$.push(of(catalogsFromConfig));
+      observables$.push(of(catalogsFromConfig).pipe(
+        map((catalogs: Catalog[]) => catalogs.map((c) => {
+           if (!c.id) {
+             c.id = uuid();
+           }
+           return c;
+         }))
+      ));
     }
 
     return concat(...observables$) as Observable<Catalog[]>;
diff --git a/packages/geo/src/lib/datasource/utils/id-generator.ts b/packages/geo/src/lib/datasource/utils/id-generator.ts
index 9784dafdb8..45e70ad70e 100644
--- a/packages/geo/src/lib/datasource/utils/id-generator.ts
+++ b/packages/geo/src/lib/datasource/utils/id-generator.ts
@@ -31,7 +31,8 @@ export function generateIdFromSourceOptions(options: DataSourceOptions): string
  */
 export function generateWMSIdFromSourceOptions(options: WMSDataSourceOptions) {
   const layers = options.params.layers;
-  const chain = 'wms' + options.url + layers;
+  const url = options.url.charAt(0) === '/'? window.location.origin + options.url : options.url
+  const chain = 'wms' + url + layers;
   return Md5.hashStr(chain) as string;
 }
 
diff --git a/packages/geo/src/lib/layer/layer-list/layer-list.component.ts b/packages/geo/src/lib/layer/layer-list/layer-list.component.ts
index 4a114cbc08..d13956f8a3 100644
--- a/packages/geo/src/lib/layer/layer-list/layer-list.component.ts
+++ b/packages/geo/src/lib/layer/layer-list/layer-list.component.ts
@@ -145,13 +145,13 @@ export class LayerListComponent implements OnInit, OnDestroy {
   getLowerLayer() {
     return this.layers.filter(l => !l.baseLayer).reduce((prev, current) => {
       return (prev.zIndex < current.zIndex) ? prev : current;
-    });
+    }, { zIndex: undefined, id: undefined });
   }
 
   getUpperLayer() {
     return this.layers.filter(l => !l.baseLayer).reduce((prev, current) => {
       return (prev.zIndex > current.zIndex) ? prev : current;
-    });
+    }, { zIndex: undefined, id: undefined });
   }
 
   private next() {
diff --git a/packages/geo/src/lib/map/shared/mapOffline.directive.ts b/packages/geo/src/lib/map/shared/mapOffline.directive.ts
index 3e01da2b3d..1b15b4c785 100644
--- a/packages/geo/src/lib/map/shared/mapOffline.directive.ts
+++ b/packages/geo/src/lib/map/shared/mapOffline.directive.ts
@@ -1,17 +1,17 @@
 import { Directive, AfterViewInit } from '@angular/core';
+import { NetworkService, ConnectionState } from '@igo2/core';
+
 import { IgoMap } from './map';
 import { MapBrowserComponent } from '../map-browser/map-browser.component';
-import { NetworkService, ConnectionState } from '@igo2/core';
-import { Subscription } from 'rxjs';
-import { Layer } from '../../layer/shared/layers/layer';
-import { MVTDataSourceOptions, XYZDataSourceOptions, FeatureDataSourceOptions } from '../../datasource';
+import { FeatureDataSourceOptions } from '../../datasource/shared/datasources/feature-datasource.interface';
+import { XYZDataSourceOptions } from '../../datasource/shared/datasources/xyz-datasource.interface';
+import { MVTDataSourceOptions } from '../../datasource/shared/datasources/mvt-datasource.interface';
 
 @Directive({
     selector: '[igoMapOffline]'
   })
 export class MapOfflineDirective implements AfterViewInit {
 
-  private context$$: Subscription;
   private state: ConnectionState;
   private component: MapBrowserComponent;
 
@@ -28,12 +28,11 @@ export class MapOfflineDirective implements AfterViewInit {
 
   ngAfterViewInit() {
     this.networkService.currentState().subscribe((state: ConnectionState) => {
-      console.log(state);
       this.state = state;
       this.changeLayer();
     });
 
-    this.map.layers$.subscribe((layers: Layer[]) => {
+    this.map.layers$.subscribe(() => {
       this.changeLayer();
     });
   }
diff --git a/packages/geo/src/lib/overlay/shared/overlay.utils.ts b/packages/geo/src/lib/overlay/shared/overlay.utils.ts
index dcc2879103..73e9a2c47c 100644
--- a/packages/geo/src/lib/overlay/shared/overlay.utils.ts
+++ b/packages/geo/src/lib/overlay/shared/overlay.utils.ts
@@ -70,7 +70,7 @@ function createOverlayDefaultStyle(): olstyle.Style {
  * Create a marker style for points
  * @returns Style
  */
-export function createOverlayMarkerStyle(color = 'blue'): olstyle.Style {
+export function createOverlayMarkerStyle(color = 'blue', text?): olstyle.Style {
   let iconColor;
   switch (color) {
     case 'blue':
@@ -90,6 +90,7 @@ export function createOverlayMarkerStyle(color = 'blue'): olstyle.Style {
       anchor: [0.5, 1]
     }),
     text: new olstyle.Text({
+      text,
       font: '12px Calibri,sans-serif',
       fill: new olstyle.Fill({ color: '#000' }),
       stroke: new olstyle.Stroke({ color: '#fff', width: 3 }),
diff --git a/packages/geo/src/lib/routing/routing-form/routing-form.component.html b/packages/geo/src/lib/routing/routing-form/routing-form.component.html
index 8820b2f133..16a5419c47 100644
--- a/packages/geo/src/lib/routing/routing-form/routing-form.component.html
+++ b/packages/geo/src/lib/routing/routing-form/routing-form.component.html
@@ -14,14 +14,14 @@
             (focus)="focus(i)" (keyup)="keyup(i,$event)">
 
           <mat-autocomplete #auto="matAutocomplete">
-            <mat-optgroup *ngFor="let source of stop.value.stopProposals" [label]="source.source" [disabled]="source.disabled">
-              <mat-option *ngFor="let result of source.results" [value]="result.title" (onSelectionChange)="chooseProposal(result,i)">
-                {{ result.title }}
+            <mat-optgroup *ngFor="let source of stop.value.stopProposals" [label]="source.source.title" [disabled]="source.source.enabled === false">
+              <mat-option *ngFor="let result of source.results" [value]="result.meta ? result.meta.title : ''" (onSelectionChange)="chooseProposal(result,i)">
+                {{ result.meta ? result.meta.title : '' }}
               </mat-option>
             </mat-optgroup>
           </mat-autocomplete>
         </mat-form-field>
-        <button mat-button *ngIf="stop.value && (stop.value.stopPoint.length>0 || stop.value.stopProposals.length>0)" matSuffix mat-icon-button
+        <button mat-button *ngIf="stop.value && (stop.value.stopPoint.length > 0 || stop.value.stopProposals.length > 0)" matSuffix mat-icon-button
           aria-label="Clear" (click)="clearStop(i)">
           <mat-icon svgIcon="close"></mat-icon>
         </button>
@@ -50,7 +50,7 @@
     <button mat-icon-button tooltip-position="below" matTooltipShowDelay="500"
       [matTooltip]="'igo.geo.routingForm.zoomRoute' | translate"
       *ngIf="routesResults" color="primary" (click)="zoomRoute()">
-      <mat-icon svgIcon="zoom-in"></mat-icon>
+      <mat-icon svgIcon="magnify-plus-outline"></mat-icon>
     </button>
       <button mat-icon-button tooltip-position="below" matTooltipShowDelay="500" [matTooltip]="'igo.geo.routingForm.addStop' | translate"
       color="primary" (click)="addStop()">
@@ -58,7 +58,7 @@
     </button>
     <button mat-icon-button tooltip-position="below" matTooltipShowDelay="500" [matTooltip]="'igo.geo.routingForm.resetRoutingBtn' | translate"
       *ngIf="routesResults" color="warn" (click)="resetForm()">
-      <mat-icon svgIcon="restore-page"></mat-icon>
+      <mat-icon svgIcon="file-restore"></mat-icon>
     </button>
     <button mat-icon-button *ngIf="routesResults" tooltip-position="below" matTooltipShowDelay="500" [matTooltip]="'igo.geo.routingForm.copy' | translate"
       color="primary" (click)="copyDirectionsToClipboard()">
@@ -76,7 +76,7 @@
   <mat-form-field *ngIf="routesResults && routesResults.length > 1">
     <mat-select placeholder="{{'igo.geo.routingForm.drivingOptions' | translate}}" (selectionChange)="changeRoute($event)" [(ngModel)]="activeRoute">
       <mat-option *ngFor="let pathRouting of routesResults; let cnt = index;" [value]="pathRouting">
-        Option {{cnt + 1}} : {{this.formatDistance(pathRouting.distance)}} ({{this.formatDuration(pathRouting.duration)}})
+        Option {{cnt + 1}} : {{formatDistance(pathRouting.distance)}} ({{formatDuration(pathRouting.duration)}})
       </mat-option>
     </mat-select>
   </mat-form-field>
@@ -85,14 +85,14 @@
 
   <mat-list>
     <h3 mat-header>{{activeRoute.title}}</h3>
-    <h3 mat-subheader>{{this.formatDistance(activeRoute.distance)}}, {{this.formatDuration(activeRoute.duration)}}</h3>
+    <h3 mat-subheader>{{formatDistance(activeRoute.distance)}}, {{formatDuration(activeRoute.duration)}}</h3>
 
     <mat-list-item (mouseenter)="showSegment(step)" (click)="showSegment(step,true)" *ngFor="let step of activeRoute.steps; let cnt = index;"
       igoListItem>
-      <mat-icon [ngClass]="this.formatStep(step,cnt).cssClass" mat-list-icon svgIcon="{{this.formatStep(step,cnt).image}}"></mat-icon>
+      <mat-icon [ngClass]="formatStep(step,cnt).cssClass" mat-list-icon svgIcon="{{formatStep(step,cnt).image}}"></mat-icon>
 
-      <h4 mat-line (click)="showSegment(step,true)">{{cnt +1}}. {{this.formatStep(step,cnt).instruction}}</h4>
-      <h4 mat-line class="right">{{this.formatDistance(step.distance)}}</h4>
+      <h4 mat-line (click)="showSegment(step,true)">{{cnt +1}}. {{formatStep(step,cnt).instruction}}</h4>
+      <h4 mat-line class="right">{{formatDistance(step.distance)}}</h4>
     </mat-list-item>
 
     <mat-divider></mat-divider>
diff --git a/packages/geo/src/lib/routing/routing-form/routing-form.component.scss b/packages/geo/src/lib/routing/routing-form/routing-form.component.scss
index 1ad5bd8da8..dbc1ba21bb 100644
--- a/packages/geo/src/lib/routing/routing-form/routing-form.component.scss
+++ b/packages/geo/src/lib/routing/routing-form/routing-form.component.scss
@@ -6,6 +6,18 @@ mat-form-field {
   height: auto;
 }
 
+form {
+  padding-top:  10px;
+  padding-left: 10px;
+  padding-right: 10px;
+  padding-bottom:  10px;
+}
+
+h3 {
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
 .mat-line {
   word-wrap: break-word !important;
   white-space: pre-wrap !important;
diff --git a/packages/geo/src/lib/routing/routing-form/routing-form.component.ts b/packages/geo/src/lib/routing/routing-form/routing-form.component.ts
index 8ffaadc5dc..8779d43f16 100644
--- a/packages/geo/src/lib/routing/routing-form/routing-form.component.ts
+++ b/packages/geo/src/lib/routing/routing-form/routing-form.component.ts
@@ -472,7 +472,7 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
   ) {
     let directiveFr;
     let directiveEn;
-    let image = 'arrow_forward';
+    let image = 'forward';
     let cssClass = 'rotate-270';
     const translatedDirection = this.translateBearing(direction);
     const translatedModifier = this.translateModifier(modifier);
@@ -487,27 +487,27 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
     }
 
     if (modifier === 'uturn') {
-      image = 'fast_forward';
+      image = 'forward';
       cssClass = 'rotate-90';
     } else if (modifier === 'sharp right') {
-      image = 'subdirectory_arrow_right';
+      image = 'subdirectory-arrow-right';
       cssClass = 'icon-flipped';
     } else if (modifier === 'right') {
-      image = 'subdirectory_arrow_right';
+      image = 'subdirectory-arrow-right';
       cssClass = 'icon-flipped';
     } else if (modifier === 'slight right') {
-      image = 'arrow_forward';
+      image = 'forward';
       cssClass = 'rotate-290';
     } else if (modifier === 'straight') {
-      image = 'arrow_forward';
+      image = 'forward';
     } else if (modifier === 'slight left') {
-      image = 'arrow_forward';
+      image = 'forward';
       cssClass = 'rotate-250';
     } else if (modifier === 'left') {
-      image = 'subdirectory_arrow_left';
+      image = 'subdirectory-arrow-left';
       cssClass = 'icon-flipped';
     } else if (modifier === 'sharp left') {
-      image = 'subdirectory_arrow_left';
+      image = 'subdirectory-arrow-left';
       cssClass = 'icon-flipped';
     }
 
@@ -526,13 +526,13 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
       directiveFr =
         'Continuer en direction ' + translatedDirection + ' sur ' + route;
       directiveEn = 'Head ' + translatedDirection + ' on ' + route;
-      image = 'explore';
+      image = 'compass';
       cssClass = '';
     } else if (type === 'depart') {
       directiveFr =
         'Aller en direction ' + translatedDirection + ' sur ' + route;
       directiveEn = 'Head ' + translatedDirection + ' on ' + route;
-      image = 'explore';
+      image = 'compass';
       cssClass = '';
     } else if (type === 'arrive') {
       if (lastStep) {
@@ -548,13 +548,13 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
       } else {
         directiveFr = 'Vous atteignez le point intermédiare sur ' + route;
         directiveEn = 'You have reached the intermediate stop onto ' + route;
-        image = 'location_on';
+        image = 'map-marker';
         cssClass = '';
       }
     } else if (type === 'merge') {
       directiveFr = 'Continuer sur ' + route;
       directiveEn = 'Continue on ' + route;
-      image = 'arrow_forward';
+      image = 'forward';
       cssClass = 'rotate-270';
     } else if (type === 'on ramp') {
       directiveFr = "Prendre l'entrée d'autoroute " + frAggregatedDirection;
@@ -584,7 +584,7 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
     } else if (type === 'continue' && modifier !== 'uturn') {
       directiveFr = 'Continuer sur ' + route;
       directiveEn = 'Continue on ' + route;
-      image = 'arrow_forward';
+      image = 'forward';
       cssClass = 'rotate-270';
     } else if (type === 'roundabout') {
       directiveFr = 'Au rond-point, prendre la ' + exit;
@@ -593,22 +593,22 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
       directiveEn = 'At the roundabout, take the ' + exit;
       directiveEn += exit === 1 ? 'st' : 'rd';
       directiveEn += ' exit towards ' + route;
-      image = 'donut_large';
+      image = 'chart-donut';
       cssClass = '';
     } else if (type === 'rotary') {
       directiveFr = 'Rond-point rotary....';
       directiveEn = 'Roundabout rotary....';
-      image = 'donut_large';
+      image = 'chart-donut';
       cssClass = '';
     } else if (type === 'roundabout turn') {
       directiveFr = 'Rond-point, prendre la ...';
       directiveEn = 'Roundabout, take the ...';
-      image = 'donut_large';
+      image = 'chart-donut';
       cssClass = '';
     } else if (type === 'exit roundabout') {
       directiveFr = 'Poursuivre vers ' + route;
       directiveEn = 'Continue to ' + route;
-      image = 'arrow_forward';
+      image = 'forward';
       cssClass = 'rotate-270';
     } else if (type === 'notification') {
       directiveFr = 'notification ....';
@@ -627,11 +627,11 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
     }
 
     if (lastStep) {
-      image = 'flag';
+      image = 'flag-variant';
       cssClass = '';
     }
     if (stepPosition === 0) {
-      image = 'explore';
+      image = 'compass';
       cssClass = '';
     }
 
@@ -936,6 +936,7 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
                 ) {
                   searchProposals.push({
                     source: element.source,
+                    meta: element.meta,
                     results: results.map(r => r.data)
                   });
                 }
@@ -1100,8 +1101,7 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
       return;
     }
     if (geometry.getType() === 'Point') {
-      const olStyle = createOverlayMarkerStyle(stopColor);
-      // stopText
+      const olStyle = createOverlayMarkerStyle(stopColor, stopText);
       feature.setStyle(olStyle);
     }
     this.routingStopsOverlayDataSource.ol.addFeature(feature);
diff --git a/packages/geo/src/lib/search/search-bar/search-bar.component.html b/packages/geo/src/lib/search/search-bar/search-bar.component.html
index 6bb4ac4170..c48cf3d2fe 100644
--- a/packages/geo/src/lib/search/search-bar/search-bar.component.html
+++ b/packages/geo/src/lib/search/search-bar/search-bar.component.html
@@ -29,11 +29,15 @@
     </button>
 
     <igo-search-selector
+      *ngIf="searchSelector"
       [searchTypes]="searchTypes"
       (change)="onSearchTypeChange($event)">
     </igo-search-selector>
 
-    <igo-search-settings></igo-search-settings>
+    <igo-search-settings
+      *ngIf="searchSettings"
+      (change)="onSearchSettingsChange()"
+    ></igo-search-settings>
   </div>
 
 
diff --git a/packages/geo/src/lib/search/search-bar/search-bar.component.ts b/packages/geo/src/lib/search/search-bar/search-bar.component.ts
index 9b1d8fb32c..8f01702f9d 100644
--- a/packages/geo/src/lib/search/search-bar/search-bar.component.ts
+++ b/packages/geo/src/lib/search/search-bar/search-bar.component.ts
@@ -83,6 +83,16 @@ export class SearchBarComponent implements OnInit, OnDestroy {
    */
   @Input() searchIcon: string;
 
+  /**
+   * Search Selector
+   */
+  @Input() searchSelector = false;
+
+  /**
+   * Search Settings
+   */
+  @Input() searchSettings = false;
+
   /**
    * Search results store
    */
@@ -149,7 +159,7 @@ export class SearchBarComponent implements OnInit, OnDestroy {
   get placeholder(): string {
     return this.empty ? this._placeholder : '';
   }
-  private _placeholder = '';
+  private _placeholder = 'search.placeholder';
 
   constructor(private searchService: SearchService) {}
 
@@ -161,7 +171,7 @@ export class SearchBarComponent implements OnInit, OnDestroy {
     this.stream$$ = this.stream$
       .pipe(
         debounce((term: string) => {
-          return term === '' ? EMPTY : timer(300);
+          return term === '' ? EMPTY : timer(200);
         }),
         distinctUntilChanged()
       )
@@ -212,6 +222,10 @@ export class SearchBarComponent implements OnInit, OnDestroy {
     this.doSearch(this.term);
   }
 
+  onSearchSettingsChange() {
+    this.doSearch(this.term);
+  }
+
   /**
    * Send the term into the stream only if this component is not disabled
    * @param term Search term
@@ -222,8 +236,10 @@ export class SearchBarComponent implements OnInit, OnDestroy {
     }
 
     this.term = term;
-    if (term.replace(/(#[^\s]*)/g, '').trim().length >= this.minLength ||
-      term.replace(/(#[^\s]*)/g, '').trim().length === 0) {
+    if (
+      term.replace(/(#[^\s]*)/g, '').trim().length >= this.minLength ||
+      term.replace(/(#[^\s]*)/g, '').trim().length === 0
+    ) {
       this.stream$.next(term);
     }
   }
diff --git a/packages/geo/src/lib/search/search-selector/search-selector.component.ts b/packages/geo/src/lib/search/search-selector/search-selector.component.ts
index 39cee64a30..4ccaaf8c62 100644
--- a/packages/geo/src/lib/search/search-selector/search-selector.component.ts
+++ b/packages/geo/src/lib/search/search-selector/search-selector.component.ts
@@ -1,5 +1,3 @@
-import {MatCheckboxChange, MatRadioChange } from '@angular/material';
-
 import {
   Component,
   Input,
@@ -11,8 +9,6 @@ import {
 
 import { SEARCH_TYPES } from '../shared/search.enums';
 import { SearchSourceService } from '../shared/search-source.service';
-import { SearchSource } from '../shared/sources/source';
-import { SearchSourceSettings, SettingOptions } from '../shared/sources/source.interfaces';
 
 /**
  * This component allows a user to select a search type yo enable. In it's
diff --git a/packages/geo/src/lib/search/search-settings/search-settings.component.ts b/packages/geo/src/lib/search/search-settings/search-settings.component.ts
index 383d487309..348cc04077 100644
--- a/packages/geo/src/lib/search/search-settings/search-settings.component.ts
+++ b/packages/geo/src/lib/search/search-settings/search-settings.component.ts
@@ -2,7 +2,6 @@ import {MatCheckboxChange, MatRadioChange } from '@angular/material';
 
 import {
   Component,
-  Input,
   Output,
   EventEmitter,
   ChangeDetectionStrategy
@@ -32,7 +31,7 @@ export class SearchSettingsComponent {
   /**
    * Event emitted when the enabled search type changes
    */
-  @Output() change = new EventEmitter<string>();
+  @Output() change = new EventEmitter<SearchSource>();
 
   constructor(private searchSourceService: SearchSourceService) {}
 
@@ -41,7 +40,7 @@ export class SearchSettingsComponent {
    * @internal
    */
   getSearchSources(): SearchSource[] {
-    return this.searchSourceService.getSources();
+    return this.searchSourceService.getSources().filter(s => s.available && s.getId() !== 'map');
   }
 
   /**
@@ -56,6 +55,7 @@ export class SearchSettingsComponent {
   ) {
     settingValue.enabled = event.checked;
     source.setParamFromSetting(setting);
+    this.change.emit(source);
   }
 
   /**
@@ -76,10 +76,12 @@ export class SearchSettingsComponent {
       }
     });
     source.setParamFromSetting(setting);
+    this.change.emit(source);
   }
 
   onCheckSearchSource(event: MatCheckboxChange, source: SearchSource) {
     source.enabled = event.checked;
+    this.change.emit(source);
   }
 
 }
diff --git a/packages/geo/src/lib/search/search.module.ts b/packages/geo/src/lib/search/search.module.ts
index c77c964b93..f56de373c7 100644
--- a/packages/geo/src/lib/search/search.module.ts
+++ b/packages/geo/src/lib/search/search.module.ts
@@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common';
 import { provideSearchSourceService } from './shared/search-source-service.providers';
 import { provideDefaultIChercheSearchResultFormatter } from './shared/sources/icherche.providers';
 import { provideDefaultCoordinatesSearchResultFormatter } from './shared/sources/coordinates.providers';
-import { provideILayerSearchResultFormatter } from './shared';
+import { provideILayerSearchResultFormatter } from './shared/sources/ilayer.providers';
 
 import { IgoSearchBarModule } from './search-bar/search-bar.module';
 import { IgoSearchSelectorModule } from './search-selector/search-selector.module';
diff --git a/packages/geo/src/lib/search/shared/search.service.ts b/packages/geo/src/lib/search/shared/search.service.ts
index 28435d38f6..81059a7bab 100644
--- a/packages/geo/src/lib/search/shared/search.service.ts
+++ b/packages/geo/src/lib/search/shared/search.service.ts
@@ -4,7 +4,10 @@ import { stringToLonLat } from '../../map';
 import { MapService } from '../../map/shared/map.service';
 
 import { SearchSource, TextSearch, ReverseSearch } from './sources/source';
-import { TextSearchOptions, ReverseSearchOptions } from './sources/source.interfaces';
+import {
+  TextSearchOptions,
+  ReverseSearchOptions
+} from './sources/source.interfaces';
 import { SearchSourceService } from './search-source.service';
 import { Research } from './search.interfaces';
 import { sourceCanSearch, sourceCanReverseSearch } from './search.utils';
@@ -20,8 +23,10 @@ import { sourceCanSearch, sourceCanReverseSearch } from './search.utils';
   providedIn: 'root'
 })
 export class SearchService {
-
-  constructor(private searchSourceService: SearchSourceService, private mapService: MapService) {}
+  constructor(
+    private searchSourceService: SearchSourceService,
+    private mapService: MapService
+  ) {}
 
   /**
    * Perform a research by text
@@ -40,8 +45,10 @@ export class SearchService {
       console.log(response.message);
     }
 
-    const sources = this.searchSourceService.getEnabledSources()
+    const sources = this.searchSourceService
+      .getEnabledSources()
       .filter(sourceCanSearch);
+
     return this.searchSources(sources, term, options || {});
   }
 
@@ -51,7 +58,8 @@ export class SearchService {
    * @returns Researches
    */
   reverseSearch(lonLat: [number, number], options?: ReverseSearchOptions) {
-    const sources = this.searchSourceService.getEnabledSources()
+    const sources = this.searchSourceService
+      .getEnabledSources()
       .filter(sourceCanReverseSearch);
     return this.reverseSearchSources(sources, lonLat, options || {});
   }
@@ -62,10 +70,14 @@ export class SearchService {
    * @param term Search term
    * @returns Observable of Researches
    */
-  private searchSources(sources: SearchSource[], term: string, options: TextSearchOptions): Research[] {
+  private searchSources(
+    sources: SearchSource[],
+    term: string,
+    options: TextSearchOptions
+  ): Research[] {
     return sources.map((source: SearchSource) => {
       return {
-        request: (source as any as TextSearch).search(term, options),
+        request: ((source as any) as TextSearch).search(term, options),
         reverse: false,
         source
       };
@@ -85,7 +97,10 @@ export class SearchService {
   ): Research[] {
     return sources.map((source: SearchSource) => {
       return {
-        request: (source as any as ReverseSearch).reverseSearch(lonLat, options),
+        request: ((source as any) as ReverseSearch).reverseSearch(
+          lonLat,
+          options
+        ),
         reverse: true,
         source
       };
diff --git a/packages/geo/src/lib/search/shared/sources/coordinates.ts b/packages/geo/src/lib/search/shared/sources/coordinates.ts
index 98534e84ee..7fea29d167 100644
--- a/packages/geo/src/lib/search/shared/sources/coordinates.ts
+++ b/packages/geo/src/lib/search/shared/sources/coordinates.ts
@@ -38,7 +38,8 @@ export class CoordinatesReverseSearchSource extends SearchSource
 
   protected getDefaultOptions(): SearchSourceOptions {
     return {
-      title: 'Coordinates'
+      title: 'Coordinates',
+      order: 1
     };
   }
 
@@ -76,6 +77,10 @@ export class CoordinatesReverseSearchSource extends SearchSource
             data[0],
             data[1]
           )
+        },
+        meta: {
+          id: '1',
+          title: String(data[0]) + ', ' + String(data[1])
         }
       },
       meta: {
diff --git a/packages/geo/src/lib/search/shared/sources/icherche.ts b/packages/geo/src/lib/search/shared/sources/icherche.ts
index c16680668d..af1af459b7 100644
--- a/packages/geo/src/lib/search/shared/sources/icherche.ts
+++ b/packages/geo/src/lib/search/shared/sources/icherche.ts
@@ -1,8 +1,8 @@
 import { Injectable, Inject } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
 
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, of } from 'rxjs';
+import { map, catchError } from 'rxjs/operators';
 
 import { LanguageService } from '@igo2/core';
 
@@ -69,7 +69,8 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
             {
               title: 'Adresse',
               value: 'adresses',
-              enabled: true
+              enabled: true,
+              hashtags: ['adresse']
             },
             // {
             //   title: 'Ancienne adresse',
@@ -79,17 +80,20 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
             {
               title: 'Code Postal',
               value: 'codes-postaux',
-              enabled: true
+              enabled: true,
+              hashtags: ['code-postal']
             },
             {
               title: 'Route',
               value: 'routes',
-              enabled: false
+              enabled: false,
+              hashtags: ['route']
             },
             {
               title: 'Municipalité',
               value: 'municipalites',
-              enabled: true
+              enabled: true,
+              hashtags: ['municipalité']
             },
             // {
             //   title: 'Ancienne municipalité',
@@ -104,22 +108,26 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
             {
               title: 'Région administrative',
               value: 'regadmin',
-              enabled: true
+              enabled: true,
+              hashtags: ['région-administrative']
             },
             {
               title: 'Lieu',
               value: 'lieux',
-              enabled: true
+              enabled: true,
+              hashtags: ['lieu']
             },
             {
               title: 'Borne',
               value: 'bornes',
-              enabled: false
+              enabled: false,
+              hashtags: ['borne']
             },
             {
               title: 'Entreprise',
               value: 'entreprises',
-              enabled: false
+              enabled: false,
+              hashtags: ['entreprise']
             }
           ]
         },
@@ -201,9 +209,17 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
     options?: TextSearchOptions
   ): Observable<SearchResult<Feature>[]> {
     const params = this.computeRequestParams(term, options || {});
-    return this.http
-      .get(this.searchUrl, { params })
-      .pipe(map((response: IChercheResponse) => this.extractResults(response)));
+    if (!params.get('type').length) {
+      return of([]);
+    }
+    return this.http.get(this.searchUrl, { params }).pipe(
+      map((response: IChercheResponse) => this.extractResults(response)),
+      catchError(err => {
+        err.error.toDisplay = true;
+        err.error.title = this.getDefaultOptions().title;
+        throw err;
+      })
+    );
   }
 
   private computeRequestParams(
@@ -234,6 +250,7 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
     const properties = this.computeProperties(data);
     const id = [this.getId(), properties.type, properties.code].join('.');
 
+    const titleHtml = data.highlight.title || data.properties.nom;
     const subtitleHtml = data.highlight.title2
       ? ' <small> ' + data.highlight.title2 + '</small>'
       : '';
@@ -255,7 +272,7 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
         dataType: FEATURE,
         id,
         title: data.properties.nom,
-        titleHtml: data.highlight.title + subtitleHtml,
+        titleHtml: titleHtml + subtitleHtml,
         icon: 'map-marker'
       }
     };
@@ -267,16 +284,27 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
       IChercheSearchSource.propertiesBlacklist
     );
 
-    const googleLinksProperties: { GoogleMaps: string, GoogleStreetView?: string } = {
-      GoogleMaps: GoogleLinks.getGoogleMapsLink(data.geometry.coordinates[0], data.geometry.coordinates[1])
+    const googleLinksProperties: {
+      GoogleMaps: string;
+      GoogleStreetView?: string;
+    } = {
+      GoogleMaps: GoogleLinks.getGoogleMapsLink(
+        data.geometry.coordinates[0],
+        data.geometry.coordinates[1]
+      )
     };
     if (data.geometry.type === 'Point') {
       googleLinksProperties.GoogleStreetView = GoogleLinks.getGoogleStreetViewLink(
-        data.geometry.coordinates[0], data.geometry.coordinates[1]
+        data.geometry.coordinates[0],
+        data.geometry.coordinates[1]
       );
     }
 
-    return Object.assign(properties, { type: data.index }, googleLinksProperties);
+    return Object.assign(
+      { type: data.index },
+      properties,
+      googleLinksProperties
+    );
   }
 
   /**
@@ -296,22 +324,13 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
     term: string,
     options: TextSearchOptions
   ): TextSearchOptions {
-    const tags = term.match(/(#[^\s]+)/g);
-    if (tags) {
-      let typeValue = '';
-      let hashtagToAdd = false;
-      tags.forEach(value => {
-        if (super.hashtagValid(super.getSettingsValues('type'), value, true)) {
-          typeValue += value.substring(1) + ',';
-          hashtagToAdd = true;
-        }
+    const hashtags = super.getHashtagsValid(term, 'type');
+    if (hashtags) {
+      options.params = Object.assign(options.params || {}, {
+        type: hashtags.join(',')
       });
-      if (hashtagToAdd) {
-        options.params = Object.assign(options.params || {}, {
-          type: typeValue.slice(0, -1)
-        });
-      }
     }
+
     return options;
   }
 }
@@ -341,7 +360,6 @@ export class IChercheReverseSearchSource extends SearchSource
     return {
       title: 'Territoire (Géocodage inversé)',
       searchUrl: 'https://geoegl.msp.gouv.qc.ca/apis/territoires/locate',
-
       settings: [
         {
           type: 'checkbox',
diff --git a/packages/geo/src/lib/search/shared/sources/ilayer.ts b/packages/geo/src/lib/search/shared/sources/ilayer.ts
index 70cbd98015..da5d7be056 100644
--- a/packages/geo/src/lib/search/shared/sources/ilayer.ts
+++ b/packages/geo/src/lib/search/shared/sources/ilayer.ts
@@ -1,7 +1,7 @@
 import { Injectable, Inject } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
 
-import { Observable, BehaviorSubject  } from 'rxjs';
+import { Observable, BehaviorSubject, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { LanguageService } from '@igo2/core';
@@ -13,7 +13,13 @@ import { QueryHtmlTarget } from './../../../query/shared/query.enums';
 import { SearchResult } from '../search.interfaces';
 import { SearchSource, TextSearch } from './source';
 import { TextSearchOptions } from './source.interfaces';
-import { ILayerSearchSourceOptions, ILayerData, ILayerItemResponse, ILayerServiceResponse, ILayerDataSource } from './ilayer.interfaces';
+import {
+  ILayerSearchSourceOptions,
+  ILayerData,
+  ILayerItemResponse,
+  ILayerServiceResponse,
+  ILayerDataSource
+} from './ilayer.interfaces';
 
 @Injectable()
 export class ILayerSearchResultFormatter {
@@ -24,11 +30,13 @@ export class ILayerSearchResultFormatter {
 
     const property = Object.entries(data.properties)
       .filter(([key]) => allowedKey.indexOf(key) !== -1)
-      .reduce((out: {[key: string]: any}, entries: [string, any]) => {
+      .reduce((out: { [key: string]: any }, entries: [string, any]) => {
         const [key, value] = entries;
         let newKey;
         try {
-          newKey = this.languageService.translate.instant('igo.geo.search.ilayer.properties.' + key);
+          newKey = this.languageService.translate.instant(
+            'igo.geo.search.ilayer.properties.' + key
+          );
         } catch (e) {
           newKey = key;
         }
@@ -48,7 +56,6 @@ export class ILayerSearchResultFormatter {
  */
 @Injectable()
 export class ILayerSearchSource extends SearchSource implements TextSearch {
-
   static id = 'ilayer';
   static type = LAYER;
 
@@ -66,7 +73,9 @@ export class ILayerSearchSource extends SearchSource implements TextSearch {
     private formatter: ILayerSearchResultFormatter
   ) {
     super(options);
-    this.languageService.translate.get(this.options.title).subscribe(title => this.title$.next(title));
+    this.languageService.translate
+      .get(this.options.title)
+      .subscribe(title => this.title$.next(title));
   }
 
   getId(): string {
@@ -90,6 +99,9 @@ export class ILayerSearchSource extends SearchSource implements TextSearch {
     options?: TextSearchOptions
   ): Observable<SearchResult<ILayerItemResponse>[]> {
     const params = this.computeSearchRequestParams(term, options || {});
+    if (!params.get('q')) {
+      return of([]);
+    }
     return this.http
       .get(this.searchUrl, { params })
       .pipe(
@@ -97,15 +109,42 @@ export class ILayerSearchSource extends SearchSource implements TextSearch {
       );
   }
 
-  private computeSearchRequestParams(term: string, options: TextSearchOptions): HttpParams {
+  private computeSearchRequestParams(
+    term: string,
+    options: TextSearchOptions
+  ): HttpParams {
     return new HttpParams({
-      fromObject: Object.assign({
-        q: term
-      }, this.params, options.params || {})
+      fromObject: Object.assign(
+        {
+          q: this.computeTerm(term)
+        },
+        this.params,
+        options.params || {}
+      )
     });
   }
 
-  private extractResults(response: ILayerServiceResponse): SearchResult<ILayerItemResponse>[] {
+  /**
+   * Remove hashtag from query
+   * @param term Query with hashtag
+   */
+  private computeTerm(term: string): string {
+    const hashtags = term.match(/(#[^\s]+)/g);
+    if (hashtags) {
+      const validHashtags = ['layer', 'layers', 'couche', 'couches'];
+      const valid = hashtags.filter(h =>
+        validHashtags.some(v => h === '#' + v)
+      );
+      if (!valid.length) {
+        return null;
+      }
+    }
+    return term.replace(/(#[^\s]*)/g, '');
+  }
+
+  private extractResults(
+    response: ILayerServiceResponse
+  ): SearchResult<ILayerItemResponse>[] {
     return response.items.map((data: ILayerData) => this.dataToResult(data));
   }
 
@@ -127,7 +166,9 @@ export class ILayerSearchSource extends SearchSource implements TextSearch {
 
   private computeLayerOptions(data: ILayerData): ILayerItemResponse {
     const url = data.properties.url;
-    const queryParams: QueryableDataSourceOptions = this.extractQueryParamsFromSourceUrl(url);
+    const queryParams: QueryableDataSourceOptions = this.extractQueryParamsFromSourceUrl(
+      url
+    );
     return {
       sourceOptions: {
         id: data.properties.id,
@@ -146,7 +187,9 @@ export class ILayerSearchSource extends SearchSource implements TextSearch {
     };
   }
 
-  private extractQueryParamsFromSourceUrl(url: string): {queryFormat: QueryFormat; queryHtmlTarget: QueryHtmlTarget; } {
+  private extractQueryParamsFromSourceUrl(
+    url: string
+  ): { queryFormat: QueryFormat; queryHtmlTarget: QueryHtmlTarget } {
     let queryFormat = QueryFormat.GML2;
     let queryHtmlTarget;
     const formatOpt = (this.options as ILayerSearchSourceOptions).queryFormat;
@@ -158,9 +201,9 @@ export class ILayerSearchSource extends SearchSource implements TextSearch {
           break;
         }
 
-        const urls = (value as any as {urls: string[]}).urls;
+        const urls = ((value as any) as { urls: string[] }).urls;
         if (Array.isArray(urls)) {
-          urls.forEach((urlOpt) => {
+          urls.forEach(urlOpt => {
             if (url.indexOf(urlOpt) !== -1) {
               queryFormat = QueryFormat[key.toUpperCase()];
             }
diff --git a/packages/geo/src/lib/search/shared/sources/nominatim.ts b/packages/geo/src/lib/search/shared/sources/nominatim.ts
index 4bf1b11500..113686c5f5 100644
--- a/packages/geo/src/lib/search/shared/sources/nominatim.ts
+++ b/packages/geo/src/lib/search/shared/sources/nominatim.ts
@@ -1,14 +1,14 @@
 import { Injectable, Inject } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
 
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { FEATURE, Feature, FeatureGeometry } from '../../../feature';
 
 import { SearchResult } from '../search.interfaces';
 import { SearchSource, TextSearch } from './source';
-import { SearchSourceOptions, TextSearchOptions, SearchSourceSettings } from './source.interfaces';
+import { SearchSourceOptions, TextSearchOptions } from './source.interfaces';
 import { NominatimData } from './nominatim.interfaces';
 
 /**
@@ -32,39 +32,42 @@ export class NominatimSearchSource extends SearchSource implements TextSearch {
 
   /*
    * Source : https://wiki.openstreetmap.org/wiki/Key:amenity
-  */
+   */
   protected getDefaultOptions(): SearchSourceOptions {
     return {
       title: 'Nominatim (OSM)',
       searchUrl: 'https://nominatim.openstreetmap.org/search',
       settings: [
         {
-            type: 'checkbox',
-            title: 'results type',
-            name: 'amenity',
-            values: [
-              {
-                title: 'Restauration',
-                value: 'bar,bbq,biergaten,cafe,drinking_water,fast_food,food_court,ice_cream,pub,restaurant',
-                enabled: false
-              },
-              {
-                title: 'Santé',
-                value: 'baby_hatch,clinic,dentist,doctors,hospital,nursing_home,pharmacy,social_facility,veterinary',
-                enabled: false
-              },
-              {
-                title: 'Divertissement',
-                value: 'arts_centre,brothel,casino,cinema,community_center_fountain,gambling,nightclub,planetarium \
+          type: 'checkbox',
+          title: 'results type',
+          name: 'amenity',
+          values: [
+            {
+              title: 'Restauration',
+              value:
+                'bar,bbq,biergaten,cafe,drinking_water,fast_food,food_court,ice_cream,pub,restaurant',
+              enabled: false
+            },
+            {
+              title: 'Santé',
+              value:
+                'baby_hatch,clinic,dentist,doctors,hospital,nursing_home,pharmacy,social_facility,veterinary',
+              enabled: false
+            },
+            {
+              title: 'Divertissement',
+              value:
+                'arts_centre,brothel,casino,cinema,community_center_fountain,gambling,nightclub,planetarium \
                           ,public_bookcase,social_centre,stripclub,studio,swingerclub,theatre,internet_cafe',
-                enabled: false
-              },
-              {
-                title: 'Finance',
-                value: 'atm,bank,bureau_de_change',
-                enabled: false
-              }
-            ]
+              enabled: false
+            },
+            {
+              title: 'Finance',
+              value: 'atm,bank,bureau_de_change',
+              enabled: false
+            }
+          ]
         },
         {
           type: 'radiobutton',
@@ -136,6 +139,9 @@ export class NominatimSearchSource extends SearchSource implements TextSearch {
     options?: TextSearchOptions
   ): Observable<SearchResult<Feature>[]> {
     const params = this.computeSearchRequestParams(term, options || {});
+    if (!params.get('q')) {
+      return of([]);
+    }
     return this.http
       .get(this.searchUrl, { params })
       .pipe(map((response: NominatimData[]) => this.extractResults(response)));
@@ -216,8 +222,7 @@ export class NominatimSearchSource extends SearchSource implements TextSearch {
   }
 
   private computeTerm(term: string): string {
-    term = this.computeTermTags(term);
-    return term;
+    return this.computeTermTags(term);
   }
 
   /**
@@ -225,23 +230,20 @@ export class NominatimSearchSource extends SearchSource implements TextSearch {
    * @param term Query with hashtag
    */
   private computeTermTags(term: string): string {
-    const tags = term.match(/(#[^\s]+)/g);
-
-    let addTagsFromSettings = true;
-    if ( tags ) {
-      tags.forEach( value => {
-        term = term.replace(value, '');
-        if ( super.hashtagValid(super.getSettingsValues('amenity'), value) ) {
-          term += '+[' + value.substring(1) + ']';
-          addTagsFromSettings = false;
-        }
-      });
-      addTagsFromSettings = false;
+    const hashtags = super.getHashtagsValid(term, 'amenity');
+    if (!hashtags) {
+      return this.computeTermSettings(term);
     }
 
-    if (addTagsFromSettings) {
-      term = this.computeTermSettings(term);
+    if (!hashtags.length) {
+      return null;
     }
+
+    term = term.replace(/(#[^\s]*)/g, '');
+    hashtags.forEach(tag => {
+      term += '+[' + tag + ']';
+    });
+
     return term;
   }
 
@@ -250,12 +252,12 @@ export class NominatimSearchSource extends SearchSource implements TextSearch {
    * @param term Query
    */
   private computeTermSettings(term: string): string {
-    this.options.settings.forEach( settings => {
-      if (settings.name === 'amenity') {
-        settings.values.forEach( conf => {
+    this.options.settings.forEach(settings => {
+      if (settings.name === 'amenity') {
+        settings.values.forEach(conf => {
           if (conf.enabled && typeof conf.value === 'string') {
             const splitted = conf.value.split(',');
-            splitted.forEach( value => {
+            splitted.forEach(value => {
               term += '+[' + value + ']';
             });
           }
diff --git a/packages/geo/src/lib/search/shared/sources/source.interfaces.ts b/packages/geo/src/lib/search/shared/sources/source.interfaces.ts
index 3be4dcb330..8bd1de75a2 100644
--- a/packages/geo/src/lib/search/shared/sources/source.interfaces.ts
+++ b/packages/geo/src/lib/search/shared/sources/source.interfaces.ts
@@ -11,17 +11,19 @@ export interface SearchSourceOptions {
 }
 
 export interface SearchSourceSettings {
-  type: 'radiobutton'|'checkbox';
+  type: 'radiobutton' | 'checkbox';
   values: SettingOptions[];
   title: string;
   name: string;
 }
 
 export interface SettingOptions {
-  value: string|number;
+  value: string | number;
   enabled: boolean;
   title: string;
+  hashtags?: string[];
 }
+
 export interface TextSearchOptions {
   params?: { [key: string]: string };
 }
diff --git a/packages/geo/src/lib/search/shared/sources/source.ts b/packages/geo/src/lib/search/shared/sources/source.ts
index d788c5de5b..f58305253d 100644
--- a/packages/geo/src/lib/search/shared/sources/source.ts
+++ b/packages/geo/src/lib/search/shared/sources/source.ts
@@ -95,27 +95,29 @@ export class SearchSource {
    * Set params from selected settings
    */
   setParamFromSetting(setting: SearchSourceSettings) {
-      switch (setting.type) {
-        case 'radiobutton':
-          setting.values.forEach( conf => {
-            if (conf.enabled) {
-              this.options.params = Object.assign( (this.options.params || {}),
-                                                    { [setting.name] : conf.value } );
-            }
-          });
-          break;
-        case 'checkbox':
-          let confValue = '';
-          setting.values.forEach( conf => {
-            if (conf.enabled) {
-              confValue += conf.value + ',';
-            }
-          });
-          confValue = confValue.slice(0, -1);
-          this.options.params = Object.assign( (this.options.params || {}),
-                                                { [setting.name] : confValue } );
-          break;
-      }
+    switch (setting.type) {
+      case 'radiobutton':
+        setting.values.forEach(conf => {
+          if (conf.enabled) {
+            this.options.params = Object.assign(this.options.params || {}, {
+              [setting.name]: conf.value
+            });
+          }
+        });
+        break;
+      case 'checkbox':
+        let confValue = '';
+        setting.values.forEach(conf => {
+          if (conf.enabled) {
+            confValue += conf.value + ',';
+          }
+        });
+        confValue = confValue.slice(0, -1);
+        this.options.params = Object.assign(this.options.params || {}, {
+          [setting.name]: confValue
+        });
+        break;
+    }
   }
 
   /**
@@ -129,36 +131,49 @@ export class SearchSource {
     this.options = Object.assign({}, this.getDefaultOptions(), options);
 
     // Set Default Params from Settings
-    this.settings.forEach( setting => {
+    this.settings.forEach(setting => {
       this.setParamFromSetting(setting);
     });
   }
 
   /**
-   * Check if hashtag is valid
+   * Get hashtags valid
    * @param hashtag hashtag from query
-   * @param completeMatch boolean
-   */
-  hashtagValid(searchSourceSetting: SearchSourceSettings, hashtag: string, completeMatch = false): boolean {
-    let hashtagIsValid = false;
-    searchSourceSetting.values.forEach( conf => {
-      const re = new RegExp('' + hashtag.substring(1) + '', 'g');
-      if ( typeof conf.value === 'string') {
-        if ( (completeMatch && conf.value === hashtag.substring(1)) ||
-              ( !completeMatch && conf.value.match(re)) ) {
-          hashtagIsValid = true;
+   */
+  getHashtagsValid(term: string, settingsName: string): string[] {
+    const hashtags = term.match(/(#[^\s]+)/g);
+    if (!hashtags) {
+      return undefined;
+    }
+
+    const searchSourceSetting = this.getSettingsValues(settingsName);
+    const hashtagsValid = [];
+    hashtags.forEach(hashtag => {
+      searchSourceSetting.values.forEach(conf => {
+        const hashtagKey = hashtag.substring(1);
+        if (typeof conf.value === 'string') {
+          const types = conf.value.split(',');
+          const index = types.indexOf(hashtagKey);
+          if (index !== -1) {
+            hashtagsValid.push(types[index]);
+          }
         }
-      }
+        if (conf.hashtags && conf.hashtags.indexOf(hashtagKey) !== -1) {
+          hashtagsValid.push(conf.value);
+        }
+      });
     });
-    return hashtagIsValid;
+
+    return hashtagsValid;
   }
 
   getSettingsValues(search: string): SearchSourceSettings {
-    return this.getDefaultOptions().settings.find( (value: SearchSourceSettings) => {
-      return value.name === search;
-    });
+    return this.getDefaultOptions().settings.find(
+      (value: SearchSourceSettings) => {
+        return value.name === search;
+      }
+    );
   }
-
 }
 
 /**
diff --git a/packages/geo/src/locale/en.geo.json b/packages/geo/src/locale/en.geo.json
index c9b5c9fff6..9707d01a6a 100644
--- a/packages/geo/src/locale/en.geo.json
+++ b/packages/geo/src/locale/en.geo.json
@@ -286,6 +286,7 @@
     }
   },
   "search": {
+    "placeholder": "Search for a localisation or a layer",
     "feature.title": "Localisation",
     "feature.placeholder": "Search for a place localisation",
     "layer.title": "Layer",
diff --git a/packages/geo/src/locale/fr.geo.json b/packages/geo/src/locale/fr.geo.json
index d5294e60d5..ed9cbfe06f 100644
--- a/packages/geo/src/locale/fr.geo.json
+++ b/packages/geo/src/locale/fr.geo.json
@@ -285,6 +285,7 @@
     }
   },
   "search": {
+    "placeholder": "Rechercher une localisation ou une couche de données",
     "feature.title": "Localisation",
     "feature.placeholder": "Rechercher une localisation",
     "layer.title": "Couche de données",
diff --git a/packages/integration/package.json b/packages/integration/package.json
index d1c0efbf34..53cfdf8d20 100644
--- a/packages/integration/package.json
+++ b/packages/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/integration",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "description": "IGO Library",
   "author": "MSP",
   "keywords": ["igo"],
@@ -16,8 +16,8 @@
   "peerDependencies": {
     "@angular/common": "^7.2.6",
     "@angular/core": "^7.2.6",
-    "@igo2/geo": "1.0.0-alpha.5",
-    "@igo2/context": "1.0.0-alpha.5",
+    "@igo2/geo": "1.0.0-alpha.6",
+    "@igo2/context": "1.0.0-alpha.6",
     "rxjs": "^6.4.0"
   }
 }
\ No newline at end of file
diff --git a/packages/integration/src/lib/directions/directions-tool/directions-tool.component.html b/packages/integration/src/lib/directions/directions-tool/directions-tool.component.html
index 6fe918136a..995e95ed95 100644
--- a/packages/integration/src/lib/directions/directions-tool/directions-tool.component.html
+++ b/packages/integration/src/lib/directions/directions-tool/directions-tool.component.html
@@ -1 +1 @@
-<igo-routing-form igoRoutingFormBinding></igo-routing-form>
+<igo-routing-form igoRoutingFormBinding [map]="map"></igo-routing-form>
diff --git a/packages/integration/src/lib/search/search-results-tool/search-results-tool.component.html b/packages/integration/src/lib/search/search-results-tool/search-results-tool.component.html
index 756c305411..2907b499bf 100644
--- a/packages/integration/src/lib/search/search-results-tool/search-results-tool.component.html
+++ b/packages/integration/src/lib/search/search-results-tool/search-results-tool.component.html
@@ -2,15 +2,24 @@
   #topPanel
   initial="100%"
   initialMobile="100%"
-  collapsed="60%"
-  expanded="calc(100% - 58px)"
+  collapsed="calc(100% - 58px)"
+  collapsedMobile="calc(100% - 58px)"
+  expanded="60%"
+  expandedMobile="60%"
   [state]="topPanelState">
 
   <div class="igo-content">
     <igo-search-results
       [store]="store"
+      placeholder="false"
       (resultFocus)="onResultFocus($event)"
-      (resultSelect)="onResultSelect($event)">
+      (resultSelect)="onResultFocus($event)">
+      <ng-template #igoSearchItemToolbar let-result="result">
+        <igo-search-add-button
+          [map]="map"
+          [layer]="result">
+        </igo-search-add-button>
+      </ng-template>
     </igo-search-results>
   </div>
 
@@ -22,7 +31,7 @@
         panelLeftButton
         class="igo-icon-button"
         (click)="toggleTopPanel()">
-        <mat-icon [svgIcon]="topPanel.state === 'collapsed'? 'arrow-down' : 'arrow-up'"></mat-icon>
+        <mat-icon [svgIcon]="(topPanelState$ | async) === 'collapsed' ? 'arrow-up' : 'arrow-down'"></mat-icon>
       </button>
 
       <button
diff --git a/packages/integration/src/lib/search/search-results-tool/search-results-tool.component.ts b/packages/integration/src/lib/search/search-results-tool/search-results-tool.component.ts
index b5cc4a9d6d..e1a6e42156 100644
--- a/packages/integration/src/lib/search/search-results-tool/search-results-tool.component.ts
+++ b/packages/integration/src/lib/search/search-results-tool/search-results-tool.component.ts
@@ -1,9 +1,9 @@
 import {
   Component,
-  ChangeDetectionStrategy
-  // ChangeDetectorRef
+  ChangeDetectionStrategy,
+  Input
 } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable, BehaviorSubject } from 'rxjs';
 import { map } from 'rxjs/operators';
 import olFormatGeoJSON from 'ol/format/GeoJSON';
 
@@ -70,6 +70,9 @@ export class SearchResultsToolComponent {
       .pipe(
         map(element => {
           this.feature = element ? (element.entity.data as Feature) : undefined;
+          if (!this.feature) {
+            this.topPanelState = 'initial';
+          }
           return this.feature;
         })
       );
@@ -77,13 +80,22 @@ export class SearchResultsToolComponent {
 
   public feature: Feature;
 
-  public topPanelState: FlexibleState = 'initial';
+  public topPanelState$ = new BehaviorSubject<FlexibleState>('initial');
+
+  @Input()
+  set topPanelState(value: FlexibleState) {
+    this.topPanelState$.next(value);
+  }
+  get topPanelState(): FlexibleState {
+    return this.topPanelState$.value;
+  }
+
   private format = new olFormatGeoJSON();
 
   constructor(
     private mapState: MapState,
     private layerService: LayerService,
-    private searchState: SearchState // private cdRef: ChangeDetectorRef
+    private searchState: SearchState
   ) {}
 
   /**
@@ -99,7 +111,7 @@ export class SearchResultsToolComponent {
   }
 
   /**
-   * Try to add a feature or a layer to the map when it's being selected
+   * Try to add a feature to the map when it's being selected
    * @internal
    * @param result A search result that could be a feature or some layer options
    */
@@ -164,4 +176,5 @@ export class SearchResultsToolComponent {
       .createAsyncLayer(layerOptions)
       .subscribe(layer => this.map.addLayer(layer));
   }
+
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 1e24cf3967..678aa8c081 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igo2/utils",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "description": "IGO Library",
   "author": "MSP",
   "keywords": ["igo"],