diff --git a/package-lock.json b/package-lock.json
index 8a7743f..ab29f26 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2692,14 +2692,14 @@
       }
     },
     "@farmmaps/common": {
-      "version": "0.0.1-prerelease.263",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.263.tgz",
-      "integrity": "sha512-MQiE2ngsujMuvOAumUGOHhL9mBRuVkPepMHcy1J2oJHYEU5wAwXmQEzT7Shw4hbbi6jQPmF6xVoZEeZTev7lWw=="
+      "version": "0.0.1-prerelease.267",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.267.tgz",
+      "integrity": "sha512-U2D6IhxIzpZVtExnRHSP8oNyva9eYCGnZEBy7jWFCY83X4R54w/+PxCB8sK8STf14IJFJcmaSXpHc7Wyd7GrbA=="
     },
     "@farmmaps/common-map": {
-      "version": "0.0.1-prerelease.263",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.263.tgz",
-      "integrity": "sha512-xzU+dV3C93qDpjAV5CX2g8ToIpvZKGSY0G+JP6b4MyCbu1qO9H6lHs4skQPNc26Tf13l0cyX9htLpjtZK0utJw=="
+      "version": "0.0.1-prerelease.267",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.267.tgz",
+      "integrity": "sha512-lZG9abbuVNtFNPKLddYfBRD6qhc6fMslL4wTIKjX8P7yfBM6/W5FAlkcQEJqcTj9k/0fzRlzzKQ2dJouGkctcQ=="
     },
     "@istanbuljs/schema": {
       "version": "0.1.2",
diff --git a/package.json b/package.json
index c52a547..1b03cec 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "@angular/platform-browser-dynamic": "~9.1.0",
     "@angular/router": "~9.1.0",
     "@microsoft/signalr": "^3.1.3",
-    "@farmmaps/common": ">=0.0.1-prerelease.263 <0.0.1",
-    "@farmmaps/common-map": ">=0.0.1-prerelease.263 <0.0.1",
+    "@farmmaps/common": ">=0.0.1-prerelease.267 <0.0.1",
+    "@farmmaps/common-map": ">=0.0.1-prerelease.267 <0.0.1",
     "@ng-bootstrap/ng-bootstrap": "^6.0",
     "@ngrx/effects": "^9.0",
     "@ngrx/router-store": "^9.0",
diff --git a/projects/common-map/src/fm-map/components/map-search/map-search.component.html b/projects/common-map/src/fm-map/components/map-search/map-search.component.html
index 67fb6b3..f90acf6 100644
--- a/projects/common-map/src/fm-map/components/map-search/map-search.component.html
+++ b/projects/common-map/src/fm-map/components/map-search/map-search.component.html
@@ -19,11 +19,11 @@
       <div class="options">
         <div class="form-check">
           <input class="form-check-input" (ngModelChange)="handleChangeEnableDateFilter($event)" [ngModel]="dateFilter" name="datefilterEnabled" type="checkbox" value="" id="filtercheck1">
-          <label class="form-check-label" for="filtercheck1">from <a (click)="handleOpenSelectPeriodModal($event)" href="#">{{startEndCaption}}</a></label>
+          <label class="form-check-label" for="filtercheck1"><span i18n>from</span> <a (click)="handleOpenSelectPeriodModal($event)" href="#">{{startEndCaption}}</a></label>
         </div>
         <div class="form-check">
           <input class="form-check-input" (ngModelChange)="handleChangeEnableBBOXFilter($event)" [ngModel]="filterOptionsLocal.bboxFilter" name="bboxfilterEnabled" type="checkbox" value="" id="filtercheck2">
-          <label class="form-check-label" for="filtercheck2">Restrict to visible area</label>
+          <label class="form-check-label" for="filtercheck2" i18n>Restrict to visible area</label>
         </div>    
       </div>
       <div class="shortcuts">
diff --git a/projects/common-map/src/fm-map/components/map-search/map-search.component.ts b/projects/common-map/src/fm-map/components/map-search/map-search.component.ts
index fe8c2e5..a31750d 100644
--- a/projects/common-map/src/fm-map/components/map-search/map-search.component.ts
+++ b/projects/common-map/src/fm-map/components/map-search/map-search.component.ts
@@ -67,7 +67,7 @@ export class MapSearchComponent {
   public disabled: boolean = true;
 
   constructor(private typeaheadService: TypeaheadService, private timespanService: TimespanService) {
-    this.filterOptionsLocal = { query: "", tags: "", startDate: null, endDate: null, bboxFilter: true, itemType: null, itemCode:null,level:0,parentCode:null,bbox:[] };   
+    this.filterOptionsLocal = { query: "", tags: "", startDate: null, endDate: null, bboxFilter: false, itemType: null, itemCode:null,level:0,parentCode:null,bbox:[] };   
   }
 
   search = (text$: Observable<string>) =>
diff --git a/projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.html b/projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.html
index 0fbc85b..f667231 100644
--- a/projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.html
+++ b/projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.html
@@ -1,31 +1,31 @@
-<ng-template #content let-c="close" let-d="dismiss">
-  
-    <div class="modal-header">
-      <h4 class="modal-title" i18n>Select period</h4>
-      <button type="button" class="close" aria-label="Close" (click)="d('Cross click'); onCloseModal.emit()">
-        <span aria-hidden="true">&times;</span>
-      </button>
-    </div>
-    <div class="modal-body">
-      <ngb-datepicker #dp ngModel (ngModelChange)="onDateChange($event)" [displayMonths]="2" [dayTemplate]="t">
-      </ngb-datepicker>
-
-      <ng-template #t let-date="date" let-focused="focused">
-        <span class="custom-day"
-              [class.focused]="focused"
-              [class.range]="isFrom(date) || isTo(date) || isInside(date) || isHovered(date)"
-              [class.faded]="isHovered(date) || isInside(date)"
-              (mouseenter)="hoveredDate = date"
-              (mouseleave)="hoveredDate = null">
-          {{ date.day }}
-        </span>
-      </ng-template>
-    </div>
-    <div class="modal-footer">
-      <button type="submit" class="btn btn-primary" (click)="handleSelect($event)" i18n>Select</button>
-      <button type="button" class="btn btn-secondary" (click)="c('Close click'); onCloseModal.emit()" i18n>Close</button>
-    </div>
-  
-</ng-template>
-
-
+<ng-template #content let-c="close" let-d="dismiss">
+  
+    <div class="modal-header">
+      <h4 class="modal-title" i18n>Select period</h4>
+      <button type="button" class="close" aria-label="Close" (click)="d('Cross click'); onCloseModal.emit()">
+        <span aria-hidden="true">&times;</span>
+      </button>
+    </div>
+    <div class="modal-body">
+      <ngb-datepicker #dp ngModel (ngModelChange)="onDateChange($event)" [displayMonths]="2" [dayTemplate]="t">
+      </ngb-datepicker>
+
+      <ng-template #t let-date="date" let-focused="focused">
+        <span class="custom-day"
+              [class.focused]="focused"
+              [class.range]="isFrom(date) || isTo(date) || isInside(date) || isHovered(date)"
+              [class.faded]="isHovered(date) || isInside(date)"
+              (mouseenter)="hoveredDate = date"
+              (mouseleave)="hoveredDate = null">
+          {{ date.day }}
+        </span>
+      </ng-template>
+    </div>
+    <div class="modal-footer">
+      <button type="submit" class="btn btn-primary" (click)="handleSelect($event)" i18n>Select</button>
+      <button type="button" class="btn btn-secondary" (click)="c('Close click'); onCloseModal.emit()" i18n="@@buttonClose">Close</button>
+    </div>
+  
+</ng-template>
+
+