diff --git a/backend/routes/GalleryRouter.ts b/backend/routes/GalleryRouter.ts
index 18ec667c..dbdffdc6 100644
--- a/backend/routes/GalleryRouter.ts
+++ b/backend/routes/GalleryRouter.ts
@@ -52,7 +52,7 @@ export class GalleryRouter{
 
     private addAutoComplete() {
         this.app.get("/api/gallery/autocomplete/:text",
-          //  AuthenticationMWs.authenticate,
+            AuthenticationMWs.authenticate,
             GalleryMWs.autocomplete,
             RenderingMWs.renderResult
         );
diff --git a/common/entities/Directory.ts b/common/entities/Directory.ts
index 98126299..22d512bb 100644
--- a/common/entities/Directory.ts
+++ b/common/entities/Directory.ts
@@ -1,10 +1,10 @@
 import {Photo} from "./Photo";
 export class Directory{
     
-    constructor(public id:number,
-                public name:string,
-                public path:string,
-                public lastUpdate:Date,
-                public directories:Array<Directory>,
-                public photos:Array<Photo>){}
+    constructor(public id?:string,
+                public name?:string,
+                public path?:string,
+                public lastUpdate?:Date,
+                public directories:Array<Directory>  = [],
+                public photos:Array<Photo> = []){}
 }
\ No newline at end of file
diff --git a/common/entities/Photo.ts b/common/entities/Photo.ts
index 0074d003..af94fe59 100644
--- a/common/entities/Photo.ts
+++ b/common/entities/Photo.ts
@@ -1,7 +1,7 @@
 import {Utils} from "../Utils";
 import {Directory} from "./Directory";
 export class Photo {
-    constructor(public id:number, public name:string, public width:number, public height:number) {
+    constructor(public id:string, public name:string, public width:number, public height:number) {
     }
 
     public static getThumbnailPath(directory:Directory,photo:Photo){
diff --git a/common/entities/User.ts b/common/entities/User.ts
index 9954e996..873407b0 100644
--- a/common/entities/User.ts
+++ b/common/entities/User.ts
@@ -8,5 +8,5 @@ export enum UserRoles{
 }
 
 export class User { 
-    constructor(public id?:number,public name?:string, public password?:string, public role:UserRoles = UserRoles.User){}
+    constructor(public id?:string,public name?:string, public password?:string, public role:UserRoles = UserRoles.User){}
 }
\ No newline at end of file
diff --git a/frontend/app/gallery/gallery.component.html b/frontend/app/gallery/gallery.component.html
index 0ec75c97..3246aa67 100644
--- a/frontend/app/gallery/gallery.component.html
+++ b/frontend/app/gallery/gallery.component.html
@@ -3,10 +3,10 @@
     <div navbar>
         <gallery-search></gallery-search>
     </div>
-    <div body class="container" style="width: 100%; padding:0">
-        <div *ngIf="currentDirectory" *ngFor="let directory of currentDirectory.directories">
+    <div body class="container" style="width: 100%; padding:0" *ngIf="currentDirectory">
+        <div  *ngFor="let directory of currentDirectory.directories">
             <gallery-directory *ngIf="directory" [directory]="directory"></gallery-directory>
         </div>
-        <gallery-grid [directory]="currentDirectory" [lightbox]="lightbox"></gallery-grid>
+        <gallery-grid  [directory]="currentDirectory" [lightbox]="lightbox"></gallery-grid>
     </div>
 </app-frame>
\ No newline at end of file
diff --git a/frontend/app/gallery/gallery.component.ts b/frontend/app/gallery/gallery.component.ts
index 047bf799..8943234b 100644
--- a/frontend/app/gallery/gallery.component.ts
+++ b/frontend/app/gallery/gallery.component.ts
@@ -24,7 +24,7 @@ import {GallerySearchComponent} from "./search/search.gallery.component";
 })
 export class GalleryComponent implements OnInit{
 
-    currentDirectory:Directory = new Directory(-1,"","/",new Date(),[],[]);
+    currentDirectory:Directory = new Directory();
     
     
     constructor(private _galleryService:GalleryService,
diff --git a/frontend/app/gallery/photo/photo.gallery.component.ts b/frontend/app/gallery/photo/photo.gallery.component.ts
index 8be7d38b..9a2240d8 100644
--- a/frontend/app/gallery/photo/photo.gallery.component.ts
+++ b/frontend/app/gallery/photo/photo.gallery.component.ts
@@ -2,8 +2,7 @@
 
 import {Component, Input, ElementRef, ViewChild} from '@angular/core';
 import {Photo} from "../../../../common/entities/Photo";
-import {Directory} from "../../../../common/entities/Directory";
-import {Utils} from "../../../../common/Utils";
+import {Directory} from "../../../../common/entities/Directory"; 
 import {IRenderable, Dimension} from "../../model/IRenderable"; 
 
 @Component({
diff --git a/frontend/app/gallery/search/autocomplete.service.ts b/frontend/app/gallery/search/autocomplete.service.ts
index 52fc3ef6..e2f41a33 100644
--- a/frontend/app/gallery/search/autocomplete.service.ts
+++ b/frontend/app/gallery/search/autocomplete.service.ts
@@ -14,7 +14,7 @@ export class AutoCompleteService extends NetworkService {
         super(_http);
     }
  
-    public autoComplete(text:string): Promise<Message<Array<AutoCompleteItem> >>{
+    public autoComplete(text:string): Promise<Message<Array<AutoCompleteItem> >> {
        return  this.getJson("/gallery/autocomplete/"+text);
     }
 
diff --git a/frontend/app/gallery/search/search.gallery.component.html b/frontend/app/gallery/search/search.gallery.component.html
index 44956235..ba05ab1e 100644
--- a/frontend/app/gallery/search/search.gallery.component.html
+++ b/frontend/app/gallery/search/search.gallery.component.html
@@ -1,7 +1,7 @@
 <div class="col-sm-4 col-md-5 pull-right">
     <form class="navbar-form" role="search">
         <div class="input-group">
-                <input type="text" class="form-control" placeholder="Search" (keyup)="getSuggestions($event)"
+                <input type="text" class="form-control" placeholder="Search" (keyup)="getSuggestions($event)" (blur)="onFocusLost($event)"
                        name="srch-term" id="srch-term" autocomplete="off" >
 
                 <div class="autocomplete-list" *ngIf="autoCompleteItems.length > 0" >
diff --git a/frontend/app/gallery/search/search.gallery.component.ts b/frontend/app/gallery/search/search.gallery.component.ts
index 19125cb9..1d875e59 100644
--- a/frontend/app/gallery/search/search.gallery.component.ts
+++ b/frontend/app/gallery/search/search.gallery.component.ts
@@ -19,7 +19,7 @@ export class GallerySearchComponent {
 
     getSuggestions(event:KeyboardEvent){ 
         let searchText = (<HTMLInputElement>event.target).value; 
-        if(searchText.length > 0) {
+        if(searchText.trim().length > 0) {
             this._autoCompleteService.autoComplete(searchText).then((message:Message<Array<AutoCompleteItem>>) =>{
                 if(message.error){
                     //TODO: implement
@@ -28,11 +28,13 @@ export class GallerySearchComponent {
                 }
                 this.showSuggestions(message.result,searchText);
             });
+        }else{
+            this.emptyAutoComplete();            
         }
     }
 
     private showSuggestions(suggestions:Array<AutoCompleteItem>,searchText:string){
-        this.autoCompleteItems = [];
+        this.emptyAutoComplete();
         suggestions.forEach((item)=>{
             let preIndex = item.text.toLowerCase().indexOf(searchText.toLowerCase());
             let renderItem = new AutoCompleteRenderItem();
@@ -46,6 +48,14 @@ export class GallerySearchComponent {
             this.autoCompleteItems.push(renderItem);
         });
     }
+    
+    public onFocusLost(event){
+        this.autoCompleteItems = [];
+    }
+    
+    private emptyAutoComplete(){
+        this.autoCompleteItems = [];        
+    }