diff --git a/backend/model/mongoose/MongoGalleryManager.ts b/backend/model/mongoose/MongoGalleryManager.ts
index b8d6db06..c6e43b96 100644
--- a/backend/model/mongoose/MongoGalleryManager.ts
+++ b/backend/model/mongoose/MongoGalleryManager.ts
@@ -52,29 +52,24 @@ export class MongoGalleryManager implements IGalleryManager {
                     value['directory'] = savedDir;
                     value.save();
                 });
-                return cb(err, this.modelToEntity(scannedDirectory));
+                return cb(err, this.modelToEntity(savedDir));
             });
 
         });
     }
 
 
-    private modelToEntity(directroy:any):Directory {
-        console.log("modelToEntity");
-        //   console.log(directroy);
-        let directoryEntity = new Directory(directroy._id);
-        Utils.updateKeys(directoryEntity, directroy);
-        directroy.photos.forEach((photo) => {
-            let photoEntity = new Photo(null, null, null, null, null);
-            Utils.updateKeys(photoEntity, photo);
-            console.log(photoEntity);
+    private modelToEntity(directoryModel:any):Directory {
+
+        let directoryEntity = new Directory(directoryModel._id, directoryModel.name, directoryModel.path, directoryModel.lastupdate, [], []);
+
+        directoryModel.photos.forEach((photo) => {
+            let photoEntity = new Photo(photo._id, photo.name, null, photo.width, photo.height);
             directoryEntity.photos.push(photoEntity);
         });
-        directroy.directories.forEach((dir) => {
-            let dirEntity = new Directory(null, null, null, null, null, null);
-            Utils.updateKeys(dirEntity, dir);
-            console.log(dir);
-            console.log(dirEntity);
+
+        directoryModel.directories.forEach((dir) => {
+            let dirEntity = new Directory(dir._id, dir.name, dir.path, dir.lastupdate, [], []);
             directoryEntity.directories.push(dirEntity);
         });
 
diff --git a/frontend/app/gallery/gallery.component.html b/frontend/app/gallery/gallery.component.html
index 54f9ceb6..9a1e9857 100644
--- a/frontend/app/gallery/gallery.component.html
+++ b/frontend/app/gallery/gallery.component.html
@@ -11,7 +11,9 @@
     </div>
 
     <div body class="container" style="width: 100%; padding:0" *ngIf="_galleryService.content.searchResult">
-        <div> Searching for: {{_galleryService.content.searchResult.searchText}}</div>
+        <ol class="breadcrumb">
+            <li class="active"> Searching for: <strong>{{_galleryService.content.searchResult.searchText}}</strong></li>
+        </ol>
         <div *ngFor="let directory of _galleryService.content.searchResult.directories">
             <gallery-directory *ngIf="directory" [directory]="directory"></gallery-directory>
         </div>