diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index 0008040161c60c0d6f7a1a021045d28848c612eb..eded0350bb1c1e37582cec09f5299f5c1176267d 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -348,6 +348,7 @@ export class FileSource extends ScopedElementsMixin(VPULitElement) {
                                                lang="${this.lang}"
                                                auth-url="${this.nextcloudAuthUrl}"
                                                web-dav-url="${this.nextcloudWebDavUrl}"
+                                               allowed-mime-types="${this.allowedMimeTypes}"                                        
                                                @vpu-nextcloud-file-picker-file-downloaded="${(event) => {
                                                    this.sendFileEvent(event.detail.file);
                                                }}"></vpu-nextcloud-file-picker>
diff --git a/packages/file-handling/src/i18n/de/translation.json b/packages/file-handling/src/i18n/de/translation.json
index 5e1876054e5e40580ea73ff64b40075ba8b464cc..87f5ebeaf37ec81ae2f33d8191b453f633d7b9fd 100644
--- a/packages/file-handling/src/i18n/de/translation.json
+++ b/packages/file-handling/src/i18n/de/translation.json
@@ -15,6 +15,7 @@
     "open-nextcloud-file-picker": "Dateien von Ihrer Nextcloud auswählen",
     "folder-last": "In das zuletzt ausgewählte Verzeichnis springen",
     "folder-up": "In das übergeordnete Verzeichnis springen",
+    "folder-home": "In das Home Verzeichnis springen",
     "select-files": "Dateien auswählen"
   }
 }
diff --git a/packages/file-handling/src/i18n/en/translation.json b/packages/file-handling/src/i18n/en/translation.json
index 56bb33a3af0222de2f52054b0cbbfd1079727a4c..98db57d44cfadce2fe848976d4862d506c1d469b 100644
--- a/packages/file-handling/src/i18n/en/translation.json
+++ b/packages/file-handling/src/i18n/en/translation.json
@@ -15,6 +15,7 @@
     "open-nextcloud-file-picker": "Select files from your Nextcloud",
     "folder-last": "Jump to the last directory",
     "folder-up": "Jump to the parent directory",
+    "folder-up": "Jump to the home directory",
     "select-files": "Select files"
   }
 }
diff --git a/packages/file-handling/src/vpu-nextcloud-file-picker.js b/packages/file-handling/src/vpu-nextcloud-file-picker.js
index 4401b1372663009bec7ee5cd75aa9d5abfdbeb5f..0deed99e14ddf5f9073a546e732617ce9749772d 100644
--- a/packages/file-handling/src/vpu-nextcloud-file-picker.js
+++ b/packages/file-handling/src/vpu-nextcloud-file-picker.js
@@ -21,11 +21,13 @@ export class NextcloudFilePicker extends ScopedElementsMixin(VPULitElement) {
         this.webDavUrl = '';
         this.loginWindow = null;
         this.isPickerActive = false;
-        this.statusText = "";
-        this.lastDirectoryPath = "/";
-        this.directoryPath = "/";
+        this.statusText = '';
+        this.lastDirectoryPath = '/';
+        this.directoryPath = '/';
         this.webDavClient = null;
         this.tabulatorTable = null;
+        this.allowedMimeTypes = '*/*';
+        this.directoriesOnly = null;
 
         this._onReceiveWindowMessage = this.onReceiveWindowMessage.bind(this);
     }
@@ -43,12 +45,13 @@ export class NextcloudFilePicker extends ScopedElementsMixin(VPULitElement) {
     static get properties() {
         return {
             lang: { type: String },
-            authUrl: { type: String, attribute: "auth-url" },
-            webDavUrl: { type: String, attribute: "web-dav-url" },
+            authUrl: { type: String, attribute: 'auth-url' },
+            webDavUrl: { type: String, attribute: 'web-dav-url' },
             isPickerActive: { type: Boolean, attribute: false },
             statusText: { type: String, attribute: false },
             directoryPath: { type: String, attribute: false },
             allowedMimeTypes: { type: String, attribute: 'allowed-mime-types' },
+            directoriesOnly: { type: Boolean, attribute: 'directories-only' },
         };
     }
 
@@ -112,18 +115,34 @@ export class NextcloudFilePicker extends ScopedElementsMixin(VPULitElement) {
                             return date + "." + month + "." + year + " " + hours + ":" + minutes;
                         }},
                 ],
+                initialSort:[
+                    {column:"basename", dir:"asc"},
+                    {column:"type", dir:"asc"},
+                ],
                 rowClick: (e, row) => {
                     const data = row.getData();
 
-                    switch(data.type) {
-                        case "directory":
-                            this.directoryClicked(e, data);
-                            break;
-                        case "file":
-                            console.log("file selected", data);
-                            break;
+                    if(this.directoriesOnly) {
+                        console.log("directory selected", data);
+                    }
+                    else
+                    {
+                        switch(data.type) {
+                            case "directory":
+                                this.directoryClicked(e, data);
+                                break;
+                            case "file":
+                                console.log("file selected", data);
+                                break;
+                        }
                     }
                 },
+                rowDblClick: (e, row) => {
+                    const data = row.getData();
+                    if(this.directoriesOnly) {
+                        this.directoryClicked(e, data);
+                    }
+                }
             });
 
             function checkFileType(data, filterParams) {
@@ -141,7 +160,6 @@ export class NextcloudFilePicker extends ScopedElementsMixin(VPULitElement) {
                 });
 
                 if (deny) {
-                    console.log(`mime type ${data.type} of file '${data.filename}' is not compatible with ${filterParams}`);
                     return false;
                 }
                 return true;
@@ -149,6 +167,13 @@ export class NextcloudFilePicker extends ScopedElementsMixin(VPULitElement) {
             if(typeof this.allowedMimeTypes !== 'undefined') {
                 this.tabulatorTable.setFilter(checkFileType, this.allowedMimeTypes);
             }
+            if(typeof this.directoriesOnly !== 'undefined' && this.directoriesOnly)
+            {
+                console.log("filter " + this.directoriesOnly);
+                this.tabulatorTable.setFilter([
+                    {field:"type", type:"=", value:"directory"},
+                ]);
+            }
         });
     }
 
@@ -284,6 +309,9 @@ export class NextcloudFilePicker extends ScopedElementsMixin(VPULitElement) {
             </div>
             <div class="block ${classMap({hidden: !this.isPickerActive})}">
                 <h2>${this.directoryPath}</h2>
+                <button class="button is-small"
+                        title="${i18n.t('nextcloud-file-picker.folder-home')}"
+                        @click="${() => { this.loadDirectory("/"); }}"><vpu-icon name="home"></vpu-icon></button>
                 <button class="button is-small"
                         title="${i18n.t('nextcloud-file-picker.folder-last')}"
                         @click="${() => { this.loadDirectory(this.lastDirectoryPath); }}">&#8678;</button>