Repository: owncloud/ocis
Pull request #4790 (2022-10-12 09:52:56)

[full-ci][tests-only] Merge master into experimental
keep experimental up-to-master


Patch:
diff --git a/.drone.env b/.drone.env
index 006991ef7af..3971384b8fd 100644
--- a/.drone.env
+++ b/.drone.env
@@ -1,7 +1,7 @@
 # The test runner source for API tests
-CORE_COMMITID=3027b2b8288211d3226ec03f308ff80b9322b10a
+CORE_COMMITID=ddd3b90f4aea35a459a6fedf78a9bcf110dc3303
 CORE_BRANCH=master
 
 # The test runner source for UI tests
-WEB_COMMITID=283eb8eebcfbcdce76198f76d465c73e3094ba8b
+WEB_COMMITID=c8c69113bc7987d6f14e32e5f1e7bd1b5491b1d9
 WEB_BRANCH=master
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cba085f859d..bbde24fd304 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,14 +20,17 @@ The following sections list the changes for unreleased.
 * Bugfix - Graph service now forwards trace context: [#4582](https://github.com/owncloud/ocis/pull/4582)
 * Bugfix - Make tokeninfo endpoint unprotected: [#4715](https://github.com/owncloud/ocis/pull/4715)
 * Bugfix - Fix wopi access to public shares: [#4631](https://github.com/owncloud/ocis/pull/4631)
+* Enhancement - Add curl to the oCIS OCI image: [#4751](https://github.com/owncloud/ocis/pull/4751)
 * Enhancement - Add Email templating: [#4564](https://github.com/owncloud/ocis/pull/4564)
 * Enhancement - Add webURL to space root: [#4588](https://github.com/owncloud/ocis/pull/4588)
 * Enhancement - Allow to configuring the reva cache store: [#4627](https://github.com/owncloud/ocis/pull/4627)
 * Enhancement - Add support for REPORT requests to /dav/spaces URLs: [#4661](https://github.com/owncloud/ocis/pull/4661)
 * Enhancement - Allow to configure applications in Web: [#4578](https://github.com/owncloud/ocis/pull/4578)
 * Enhancement - Restrict admins from self-removal: [#3713](https://github.com/owncloud/ocis/issues/3713)
+* Enhancement - Report parent id: [#4757](https://github.com/owncloud/ocis/pull/4757)
 * Enhancement - Add thumbnails support for tiff and bmp files: [#4634](https://github.com/owncloud/ocis/pull/4634)
 * Enhancement - Update reva: [#4588](https://github.com/owncloud/ocis/pull/4588)
+* Enhancement - Update ownCloud Web to v6.0.0-rc.2: [#4786](https://github.com/owncloud/ocis/pull/4786)
 * Enhancement - Make it possible to configure a WOPI folderurl: [#4716](https://github.com/owncloud/ocis/pull/4716)
 
 ## Details
@@ -141,6 +144,13 @@ The following sections list the changes for unreleased.
    https://github.com/owncloud/ocis/issues/4382
    https://github.com/owncloud/ocis/pull/4631
 
+* Enhancement - Add curl to the oCIS OCI image: [#4751](https://github.com/owncloud/ocis/pull/4751)
+
+   We've added curl to the oCIS OCI image published on Dockerhub. This can be used for eg.
+   healthchecks with the services' health endpoint.
+
+   https://github.com/owncloud/ocis/pull/4751
+
 * Enhancement - Add Email templating: [#4564](https://github.com/owncloud/ocis/pull/4564)
 
    We have added email templating to ocis. Which are send on the SpaceShared and ShareCreated
@@ -184,6 +194,13 @@ The following sections list the changes for unreleased.
 
    https://github.com/owncloud/ocis/issues/3713
 
+* Enhancement - Report parent id: [#4757](https://github.com/owncloud/ocis/pull/4757)
+
+   We now index and return the parent id of a resource in search REPORTs.
+
+   https://github.com/owncloud/ocis/issues/4727
+   https://github.com/owncloud/ocis/pull/4757
+
 * Enhancement - Add thumbnails support for tiff and bmp files: [#4634](https://github.com/owncloud/ocis/pull/4634)
 
    Support generating thumbnails for tiff and bmp files in the thumbnails service.
@@ -199,6 +216,82 @@ The following sections list the changes for unreleased.
    https://github.com/owncloud/ocis/pull/4719
    https://github.com/owncloud/ocis/pull/4750
 
+* Enhancement - Update ownCloud Web to v6.0.0-rc.2: [#4786](https://github.com/owncloud/ocis/pull/4786)
+
+   Tags: web
+
+   We updated ownCloud Web to v6.0.0-rc.2. Please refer to the changelog (linked) for details on
+   the web release.
+
+   ### Breaking changes * BREAKING CHANGE for users in
+   [owncloud/web#6648](https://github.com/owncloud/web/issues/6648): breaks existing
+   bookmarks - they won't resolve anymore. * BREAKING CHANGE for developers in
+   [owncloud/web#6648](https://github.com/owncloud/web/issues/6648): the appDefaults
+   composables from web-pkg now work with drive aliases, concatenated with relative item paths,
+   instead of webdav paths. If you use the appDefaults composables in your application it's
+   likely that your code needs to be adapted.
+
+   ### Changes * Bugfix
+   [owncloud/web#7419](https://github.com/owncloud/web/issues/7419): Add language
+   param opening external app * Bugfix
+   [owncloud/web#7731](https://github.com/owncloud/web/pull/7731): "Copy
+   Quicklink"-translations * Bugfix
+   [owncloud/web#7652](https://github.com/owncloud/web/pull/7652): Disable copy/move
+   overwrite on self * Bugfix
+   [owncloud/web#7739](https://github.com/owncloud/web/pull/7739): Disable shares
+   loading on public and trash locations * Bugfix
+   [owncloud/web#7740](https://github.com/owncloud/web/pull/7740): Disappearing
+   quicklink in sidebar * Bugfix
+   [owncloud/web#7734](https://github.com/owncloud/web/pull/7734): File name
+   reactivity * Bugfix [owncloud/web#7724](https://github.com/owncloud/web/pull/7724):
+   Folder conflict dialog * Bugfix
+   [owncloud/web#7652](https://github.com/owncloud/web/pull/7652): Inhibit move files
+   between spaces * Bugfix
+   [owncloud/web#7640](https://github.com/owncloud/web/pull/7640): "Private
+   link"-button alignment * Bugfix
+   [owncloud/web#7748](https://github.com/owncloud/web/pull/7748): Reload file list
+   after last share removal * Bugfix
+   [owncloud/web#7699](https://github.com/owncloud/web/issues/7699): Remove the "close
+   sidebar"-calls on delete * Bugfix
+   [owncloud/web#7504](https://github.com/owncloud/web/pull/7504): Resolve upload
+   existing folder * Bugfix
+   [owncloud/web#7675](https://github.com/owncloud/web/pull/7675): Search bar on small
+   screens * Bugfix [owncloud/web#7662](https://github.com/owncloud/web/pull/7662):
+   Sidebar for received shares in search file list * Bugfix
+   [owncloud/web#7506](https://github.com/owncloud/web/issues/7506): Shares loading *
+   Bugfix [owncloud/web#7632](https://github.com/owncloud/web/pull/7632): Sidebar
+   toggle icon * Bugfix [owncloud/web#7756](https://github.com/owncloud/web/pull/7756):
+   Try to obtain refresh token before the error case * Bugfix
+   [owncloud/web#7651](https://github.com/owncloud/web/pull/7651): Spaces on "Shared
+   via link"-page * Bugfix
+   [owncloud/web#7521](https://github.com/owncloud/web/issues/7521): Spaces
+   reactivity on update * Bugfix
+   [owncloud/web#7630](https://github.com/owncloud/web/pull/7630): Upload modify time *
+   Change [owncloud/web#6648](https://github.com/owncloud/web/issues/6648): Drive
+   aliases in URLs * Enhancement
+   [owncloud/web#7709](https://github.com/owncloud/web/pull/7709): Edit custom
+   permissions wording * Enhancement
+   [owncloud/web#7190](https://github.com/owncloud/web/pull/7190): Deny subfolders
+   inside share * Enhancement
+   [owncloud/web#7684](https://github.com/owncloud/web/pull/7684): Design polishing *
+   Enhancement [owncloud/web#7725](https://github.com/owncloud/web/pull/7725): Enable
+   renaming on received shares * Enhancement
+   [owncloud/web#7747](https://github.com/owncloud/web/pull/7747): Friendlier logout
+   screen * Enhancement
+   [owncloud/web#6247](https://github.com/owncloud/web/issues/6247): Id based routing *
+   Enhancement [owncloud/web#7405](https://github.com/owncloud/web/pull/7405):
+   Resolve internal links * Enhancement
+   [owncloud/web#7569](https://github.com/owncloud/web/pull/7569): Make keybindings
+   global * Enhancement
+   [owncloud/web#7405](https://github.com/owncloud/web/pull/7405): Resolve private
+   links * Enhancement [owncloud/web#7684](https://github.com/owncloud/web/pull/7684):
+   Update ODS to v14.0.0-alpha.20 * Enhancement
+   [owncloud/web#7430](https://github.com/owncloud/web/pull/7430): Webdav support in
+   web-client package
+
+   https://github.com/owncloud/ocis/pull/4786
+   https://github.com/owncloud/web/releases/tag/v6.0.0-rc.2
+
 * Enhancement - Make it possible to configure a WOPI folderurl: [#4716](https://github.com/owncloud/ocis/pull/4716)
 
    The wopi folder URL is used to jump back from an application to the containing folder in the files
diff --git a/Dockerfile b/Dockerfile
index 5b104af78d5..f2bc172ba71 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,10 +30,7 @@ RUN make ci-go-generate build
 
 FROM alpine:3.15
 
-RUN apk update && \
-	apk upgrade && \
-	apk add ca-certificates mailcap && \
-	rm -rf /var/cache/apk/* && \
+RUN apk add --no-cache ca-certificates mailcap tree attr curl && \
 	echo 'hosts: files dns' >| /etc/nsswitch.conf
 
 LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
diff --git a/Makefile b/Makefile
index fe998736262..b4038cfa476 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,7 @@ OCIS_MODULES = \
 	services/ocdav \
 	services/ocs \
 	services/proxy \
+	services/search \
 	services/settings \
 	services/sharing \
 	services/storage-system \
diff --git a/changelog/unreleased/add-curl-to-ocis-image.md b/changelog/unreleased/add-curl-to-ocis-image.md
new file mode 100644
index 00000000000..d427a83d02e
--- /dev/null
+++ b/changelog/unreleased/add-curl-to-ocis-image.md
@@ -0,0 +1,6 @@
+Enhancement: Add curl to the oCIS OCI image
+
+We've added curl to the oCIS OCI image published on Dockerhub.
+This can be used for eg. healthchecks with the services' health endpoint.
+
+https://github.com/owncloud/ocis/pull/4751
diff --git a/changelog/unreleased/report-parentid.md b/changelog/unreleased/report-parentid.md
new file mode 100644
index 00000000000..6b710fe5503
--- /dev/null
+++ b/changelog/unreleased/report-parentid.md
@@ -0,0 +1,6 @@
+Enhancement: report parent id
+
+We now index and return the parent id of a resource in search REPORTs.
+
+https://github.com/owncloud/ocis/pull/4757
+https://github.com/owncloud/ocis/issues/4727
\ No newline at end of file
diff --git a/changelog/unreleased/update-web-6.0.0-rc.2.md b/changelog/unreleased/update-web-6.0.0-rc.2.md
new file mode 100644
index 00000000000..53513430d8d
--- /dev/null
+++ b/changelog/unreleased/update-web-6.0.0-rc.2.md
@@ -0,0 +1,46 @@
+Enhancement: Update ownCloud Web to v6.0.0-rc.2
+
+Tags: web
+
+We updated ownCloud Web to v6.0.0-rc.2. Please refer to the changelog (linked) for details on the web release.
+
+### Breaking changes
+* BREAKING CHANGE for users in [owncloud/web#6648](https://github.com/owncloud/web/issues/6648): breaks existing bookmarks - they won't resolve anymore.
+* BREAKING CHANGE for developers in [owncloud/web#6648](https://github.com/owncloud/web/issues/6648): the appDefaults composables from web-pkg now work with drive aliases, concatenated with relative item paths, instead of webdav paths. If you use the appDefaults composables in your application it's likely that your code needs to be adapted.
+
+### Changes
+* Bugfix [owncloud/web#7419](https://github.com/owncloud/web/issues/7419): Add language param opening external app
+* Bugfix [owncloud/web#7731](https://github.com/owncloud/web/pull/7731): "Copy Quicklink"-translations
+* Bugfix [owncloud/web#7652](https://github.com/owncloud/web/pull/7652): Disable copy/move overwrite on self
+* Bugfix [owncloud/web#7739](https://github.com/owncloud/web/pull/7739): Disable shares loading on public and trash locations
+* Bugfix [owncloud/web#7740](https://github.com/owncloud/web/pull/7740): Disappearing quicklink in sidebar
+* Bugfix [owncloud/web#7734](https://github.com/owncloud/web/pull/7734): File name reactivity
+* Bugfix [owncloud/web#7724](https://github.com/owncloud/web/pull/7724): Folder conflict dialog
+* Bugfix [owncloud/web#7652](https://github.com/owncloud/web/pull/7652): Inhibit move files between spaces
+* Bugfix [owncloud/web#7640](https://github.com/owncloud/web/pull/7640): "Private link"-button alignment
+* Bugfix [owncloud/web#7748](https://github.com/owncloud/web/pull/7748): Reload file list after last share removal
+* Bugfix [owncloud/web#7699](https://github.com/owncloud/web/issues/7699): Remove the "close sidebar"-calls on delete
+* Bugfix [owncloud/web#7504](https://github.com/owncloud/web/pull/7504): Resolve upload existing folder
+* Bugfix [owncloud/web#7675](https://github.com/owncloud/web/pull/7675): Search bar on small screens
+* Bugfix [owncloud/web#7662](https://github.com/owncloud/web/pull/7662): Sidebar for received shares in search file list
+* Bugfix [owncloud/web#7506](https://github.com/owncloud/web/issues/7506): Shares loading
+* Bugfix [owncloud/web#7632](https://github.com/owncloud/web/pull/7632): Sidebar toggle icon
+* Bugfix [owncloud/web#7756](https://github.com/owncloud/web/pull/7756): Try to obtain refresh token before the error case
+* Bugfix [owncloud/web#7651](https://github.com/owncloud/web/pull/7651): Spaces on "Shared via link"-page
+* Bugfix [owncloud/web#7521](https://github.com/owncloud/web/issues/7521): Spaces reactivity on update
+* Bugfix [owncloud/web#7630](https://github.com/owncloud/web/pull/7630): Upload modify time
+* Change [owncloud/web#6648](https://github.com/owncloud/web/issues/6648): Drive aliases in URLs
+* Enhancement [owncloud/web#7709](https://github.com/owncloud/web/pull/7709): Edit custom permissions wording
+* Enhancement [owncloud/web#7190](https://github.com/owncloud/web/pull/7190): Deny subfolders inside share
+* Enhancement [owncloud/web#7684](https://github.com/owncloud/web/pull/7684): Design polishing
+* Enhancement [owncloud/web#7725](https://github.com/owncloud/web/pull/7725): Enable renaming on received shares
+* Enhancement [owncloud/web#7747](https://github.com/owncloud/web/pull/7747): Friendlier logout screen
+* Enhancement [owncloud/web#6247](https://github.com/owncloud/web/issues/6247): Id based routing
+* Enhancement [owncloud/web#7405](https://github.com/owncloud/web/pull/7405): Resolve internal links
+* Enhancement [owncloud/web#7569](https://github.com/owncloud/web/pull/7569): Make keybindings global
+* Enhancement [owncloud/web#7405](https://github.com/owncloud/web/pull/7405): Resolve private links
+* Enhancement [owncloud/web#7684](https://github.com/owncloud/web/pull/7684): Update ODS to v14.0.0-alpha.20
+* Enhancement [owncloud/web#7430](https://github.com/owncloud/web/pull/7430): Webdav support in web-client package
+
+https://github.com/owncloud/ocis/pull/4786
+https://github.com/owncloud/web/releases/tag/v6.0.0-rc.2
diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml
index 58d16c3f294..555ff8f2aea 100644
--- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml
+++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_hello/docker-compose.yml b/deployments/examples/ocis_hello/docker-compose.yml
index ffe0499728e..e2a93b1cd84 100644
--- a/deployments/examples/ocis_hello/docker-compose.yml
+++ b/deployments/examples/ocis_hello/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_individual_services/docker-compose.yml b/deployments/examples/ocis_individual_services/docker-compose.yml
index 8974bd9cc77..faefbb339d7 100644
--- a/deployments/examples/ocis_individual_services/docker-compose.yml
+++ b/deployments/examples/ocis_individual_services/docker-compose.yml
@@ -17,7 +17,7 @@ networks:
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_keycloak/docker-compose.yml b/deployments/examples/ocis_keycloak/docker-compose.yml
index 630ca1b70ea..ca1b637493c 100644
--- a/deployments/examples/ocis_keycloak/docker-compose.yml
+++ b/deployments/examples/ocis_keycloak/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_ldap/docker-compose.yml b/deployments/examples/ocis_ldap/docker-compose.yml
index 05fcb8a87c4..aad37834761 100644
--- a/deployments/examples/ocis_ldap/docker-compose.yml
+++ b/deployments/examples/ocis_ldap/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_s3/docker-compose.yml b/deployments/examples/ocis_s3/docker-compose.yml
index 91d07b291e8..06b5f36801d 100644
--- a/deployments/examples/ocis_s3/docker-compose.yml
+++ b/deployments/examples/ocis_s3/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_traefik/docker-compose.yml b/deployments/examples/ocis_traefik/docker-compose.yml
index 1b37ca17aa2..6fa018372f8 100644
--- a/deployments/examples/ocis_traefik/docker-compose.yml
+++ b/deployments/examples/ocis_traefik/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh b/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh
index b7e354637eb..fd7960259b1 100755
--- a/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh
+++ b/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 echo "${WOPISECRET}" > /etc/wopi/wopisecret
@@ -6,13 +6,8 @@ echo "${WOPISECRET}" > /etc/wopi/wopisecret
 cp /etc/wopi/wopiserver.conf.dist /etc/wopi/wopiserver.conf
 sed -i 's/wopiserver.owncloud.test/'${WOPISERVER_DOMAIN}'/g' /etc/wopi/wopiserver.conf
 
-
 if [ "$WOPISERVER_INSECURE" == "true" ]; then
     sed -i 's/sslverify\s=\sTrue/sslverify = False/g' /etc/wopi/wopiserver.conf
 fi
 
-touch /var/log/wopi/wopiserver.log
-
-/app/wopiserver.py &
-
-tail -f /var/log/wopi/wopiserver.log
+/app/wopiserver.py
diff --git a/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist b/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist
index 8be39f41b88..808d105292e 100644
--- a/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist
+++ b/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist
@@ -18,6 +18,8 @@ port = 8880
 # Logging level. Debug enables the Flask debug mode as well.
 # Valid values are: Debug, Info, Warning, Error.
 loglevel = Error
+loghandler = stream
+logdest = stdout
 
 # URL of your WOPI server or your HA proxy in front of it
 wopiurl = https://wopiserver.owncloud.test
@@ -92,7 +94,6 @@ usehttps = no
 wopicert = /etc/grid-security/host.crt
 wopikey = /etc/grid-security/host.key
 
-
 [bridge]
 # SSL certificate check for the connected apps
 sslverify = True
diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml
index 90083d9024a..3b5a65aac17 100644
--- a/deployments/examples/ocis_wopi/docker-compose.yml
+++ b/deployments/examples/ocis_wopi/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
@@ -99,6 +99,7 @@ services:
       APP_PROVIDER_WOPI_APP_URL: https://${COLLABORA_DOMAIN:-collabora.owncloud.test}
       APP_PROVIDER_WOPI_INSECURE: "${INSECURE:-false}"
       APP_PROVIDER_WOPI_WOPI_SERVER_EXTERNAL_URL: https://${WOPISERVER_DOMAIN:-wopiserver.owncloud.test}
+      APP_PROVIDER_WOPI_FOLDER_URL_BASE_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
     volumes:
       - ocis-config:/etc/ocis
     logging:
@@ -124,6 +125,7 @@ services:
       APP_PROVIDER_WOPI_APP_URL: https://${ONLYOFFICE_DOMAIN:-onlyoffice.owncloud.test}
       APP_PROVIDER_WOPI_INSECURE: "${INSECURE:-false}"
       APP_PROVIDER_WOPI_WOPI_SERVER_EXTERNAL_URL: https://${WOPISERVER_DOMAIN:-wopiserver.owncloud.test}
+      APP_PROVIDER_WOPI_FOLDER_URL_BASE_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
     volumes:
       - ./config/ocis-appdriver-onlyoffice/entrypoint-override.sh:/entrypoint-override.sh
       - ocis-config:/etc/ocis
@@ -131,11 +133,11 @@ services:
       driver: "local"
     restart: always
   wopiserver:
-    image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v8.3.3}
+    image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v9.1.1}
     networks:
       ocis-net:
     entrypoint:
-      - /bin/bash
+      - /bin/sh
       - /entrypoint-override.sh
     environment:
       WOPISERVER_INSECURE: "${INSECURE:-false}"
@@ -145,7 +147,6 @@ services:
       - ./config/wopiserver/entrypoint-override.sh:/entrypoint-override.sh
       - ./config/wopiserver/wopiserver.conf.dist:/etc/wopi/wopiserver.conf.dist
       - wopi-data:/var/wopi_local_storage
-      - wopi-logs:/var/log/wopi
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.wopiserver.entrypoints=https"
@@ -158,7 +159,7 @@ services:
     restart: always
 
   collabora:
-    image: collabora/code:22.05.4.1.1@sha256:157cfc71fe9fe09b672dd28222f91e0c3f307e593fbb449fb297f8659ac8f960
+    image: collabora/code:22.05.6.3.1
     networks:
       ocis-net:
     environment:
@@ -181,7 +182,7 @@ services:
     restart: always
 
   onlyoffice:
-    image: onlyoffice/documentserver:7.1.1
+    image: onlyoffice/documentserver:7.2
     networks:
       ocis-net:
     environment:
@@ -206,7 +207,6 @@ volumes:
   ocis-config:
   ocis-data:
   wopi-data:
-  wopi-logs:
 
 networks:
   ocis-net:
diff --git a/go.mod b/go.mod
index fcaa3976a2f..756dd0053c5 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/blevesearch/bleve/v2 v2.3.4
 	github.com/coreos/go-oidc/v3 v3.4.0
 	github.com/cs3org/go-cs3apis v0.0.0-20220929083235-bb0b1a236d6c
-	github.com/cs3org/reva/v2 v2.10.1-0.20221008102208-c3d124544a85
+	github.com/cs3org/reva/v2 v2.10.1-0.20221012075701-cdcfc79fcd24
 	github.com/disintegration/imaging v1.6.2
 	github.com/ggwhite/go-masker v1.0.9
 	github.com/go-chi/chi/v5 v5.0.7
@@ -29,7 +29,7 @@ require (
 	github.com/go-micro/plugins/v4/registry/memory v1.1.0
 	github.com/go-micro/plugins/v4/registry/nats v1.1.0
 	github.com/go-micro/plugins/v4/server/grpc v1.1.1
-	github.com/go-micro/plugins/v4/server/http v1.1.0
+	github.com/go-micro/plugins/v4/server/http v1.1.1
 	github.com/go-micro/plugins/v4/wrapper/breaker/gobreaker v1.1.0
 	github.com/go-micro/plugins/v4/wrapper/monitoring/prometheus v1.1.0
 	github.com/go-micro/plugins/v4/wrapper/trace/opencensus v1.1.0
@@ -52,7 +52,7 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/ginkgo/v2 v2.2.0
-	github.com/onsi/gomega v1.20.2
+	github.com/onsi/gomega v1.21.1
 	github.com/orcaman/concurrent-map v1.0.0
 	github.com/owncloud/libre-graph-api-go v0.17.0
 	github.com/pkg/errors v0.9.1
@@ -64,7 +64,7 @@ require (
 	github.com/test-go/testify v1.1.4
 	github.com/thejerf/suture/v4 v4.0.2
 	github.com/tus/tusd v1.9.2
-	github.com/urfave/cli/v2 v2.17.1
+	github.com/urfave/cli/v2 v2.19.2
 	github.com/xhit/go-simple-mail/v2 v2.12.0
 	go-micro.dev/v4 v4.9.0
 	go.etcd.io/bbolt v1.3.6
@@ -82,7 +82,7 @@ require (
 	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035
 	golang.org/x/text v0.3.7
 	google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006
-	google.golang.org/grpc v1.49.0
+	google.golang.org/grpc v1.50.0
 	google.golang.org/protobuf v1.28.1
 	gopkg.in/yaml.v2 v2.4.0
 	gotest.tools/v3 v3.3.0
diff --git a/go.sum b/go.sum
index 113817809c6..0a32e382efb 100644
--- a/go.sum
+++ b/go.sum
@@ -297,8 +297,8 @@ github.com/crewjam/saml v0.4.6 h1:XCUFPkQSJLvzyl4cW9OvpWUbRf0gE7VUpU8ZnilbeM4=
 github.com/crewjam/saml v0.4.6/go.mod h1:ZBOXnNPFzB3CgOkRm7Nd6IVdkG+l/wF+0ZXLqD96t1A=
 github.com/cs3org/go-cs3apis v0.0.0-20220929083235-bb0b1a236d6c h1:b+YTmOGlf43mnF8MzO0fsy8/Ho8JLu44Iq5Y0fKLJMM=
 github.com/cs3org/go-cs3apis v0.0.0-20220929083235-bb0b1a236d6c/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
-github.com/cs3org/reva/v2 v2.10.1-0.20221008102208-c3d124544a85 h1:Ac66j0ko1XmMWQ8lqNHtU+VbulQmnYtFvXeL3l7fza0=
-github.com/cs3org/reva/v2 v2.10.1-0.20221008102208-c3d124544a85/go.mod h1:lFNeXqfaceGlthOo7bNuVCXfBCjO6oMfX5olglnLAIQ=
+github.com/cs3org/reva/v2 v2.10.1-0.20221012075701-cdcfc79fcd24 h1:ViYROsndRmg3ekG40NrU1KA9m+TjDHLGx3RbvQnjp/Q=
+github.com/cs3org/reva/v2 v2.10.1-0.20221012075701-cdcfc79fcd24/go.mod h1:lFNeXqfaceGlthOo7bNuVCXfBCjO6oMfX5olglnLAIQ=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI=
 github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
@@ -448,8 +448,8 @@ github.com/go-micro/plugins/v4/registry/nats v1.1.0 h1:oqQzP5P2FkfoYZiBRuCWsKqh4
 github.com/go-micro/plugins/v4/registry/nats v1.1.0/go.mod h1:4tTfa958PiYUOZNBBNoY1awmgfxFcqQOmix8cR3UM+E=
 github.com/go-micro/plugins/v4/server/grpc v1.1.1 h1:7V5K8RTQhzzFsJCPkKXTJr4YrWyIw5xebUTtDY27l3k=
 github.com/go-micro/plugins/v4/server/grpc v1.1.1/go.mod h1:GntDOa4zIHmyBLAvSXP05gK6im+Fw+Dh8fxUk/yiwaI=
-github.com/go-micro/plugins/v4/server/http v1.1.0 h1:3zigMm74qsuGJDMHCuYFy+2PEvnKND3S5AcabuWWyr8=
-github.com/go-micro/plugins/v4/server/http v1.1.0/go.mod h1:ZjVZi1l16RjzyT3IISirh9BEZdqzaLLwiE/1fvdSbnI=
+github.com/go-micro/plugins/v4/server/http v1.1.1 h1:n45l9rrJUWXT25W3DmTBl9DJoc31DxwiL6t3zUoa0e0=
+github.com/go-micro/plugins/v4/server/http v1.1.1/go.mod h1:ZjVZi1l16RjzyT3IISirh9BEZdqzaLLwiE/1fvdSbnI=
 github.com/go-micro/plugins/v4/store/nats-js v1.1.0 h1:6Fe1/eLtg8kRyaGvMILp4olYtTDGwYNBXyb1sYfAWGk=
 github.com/go-micro/plugins/v4/store/nats-js v1.1.0/go.mod h1:jJf7Gm39OafZlT3s3UE2/9NIYj6OlI2fmZ4czSA3gvo=
 github.com/go-micro/plugins/v4/store/redis v1.1.0 h1:QWl5FAfMaekppZGNcj0mSyi8vCkjZGvHoGdaBNeKNm4=
@@ -1000,8 +1000,8 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
-github.com/onsi/gomega v1.20.2 h1:8uQq0zMgLEfa0vRrrBgaJF2gyW9Da9BmfGV+OyUzfkY=
-github.com/onsi/gomega v1.20.2/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc=
+github.com/onsi/gomega v1.21.1 h1:OB/euWYIExnPBohllTicTHmGTrMaqJ67nIu80j0/uEM=
+github.com/onsi/gomega v1.21.1/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
@@ -1218,8 +1218,8 @@ github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
-github.com/urfave/cli/v2 v2.17.1 h1:UzjDEw2dJQUE3iRaiNQ1VrVFbyAtKGH3VdkMoHA58V0=
-github.com/urfave/cli/v2 v2.17.1/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
+github.com/urfave/cli/v2 v2.19.2 h1:eXu5089gqqiDQKSnFW+H/FhjrxRGztwSxlTsVK7IuqQ=
+github.com/urfave/cli/v2 v2.19.2/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
@@ -1902,8 +1902,9 @@ google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu
 google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
 google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
 google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw=
 google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.50.0 h1:fPVVDxY9w++VjTZsYvXWqEf9Rqar/e+9zYfxKK+W+YU=
+google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/grpc/examples v0.0.0-20211102180624-670c133e568e h1:m7aQHHqd0q89mRwhwS9Bx2rjyl/hsFAeta+uGrHsQaU=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
diff --git a/ocis-pkg/registry/registry.go b/ocis-pkg/registry/registry.go
index 8cbe6b38922..6f048e44889 100644
--- a/ocis-pkg/registry/registry.go
+++ b/ocis-pkg/registry/registry.go
@@ -69,7 +69,7 @@ func GetRegistry() registry.Registry {
 			reg = mdnsr.NewRegistry()
 		}
 		// No cache needed for in-memory registry
-		if plugin == "memory" {
+		if plugin != "memory" {
 			reg = cache.New(reg, cache.WithTTL(20*time.Second))
 		}
 	})
diff --git a/ocis/docker/Dockerfile.linux.amd64 b/ocis/docker/Dockerfile.linux.amd64
index 8a0c6689413..dc5ea7fba10 100644
--- a/ocis/docker/Dockerfile.linux.amd64
+++ b/ocis/docker/Dockerfile.linux.amd64
@@ -3,10 +3,7 @@ FROM amd64/alpine:3.15
 ARG VERSION=""
 ARG REVISION=""
 
-RUN apk update && \
-	apk upgrade && \
-	apk add ca-certificates mailcap tree attr && \
-	rm -rf /var/cache/apk/* && \
+RUN apk add --no-cache ca-certificates mailcap tree attr curl && \
 	echo 'hosts: files dns' >| /etc/nsswitch.conf
 
 LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
diff --git a/ocis/docker/Dockerfile.linux.arm b/ocis/docker/Dockerfile.linux.arm
index a0c93b406ec..ae70714f03f 100644
--- a/ocis/docker/Dockerfile.linux.arm
+++ b/ocis/docker/Dockerfile.linux.arm
@@ -3,10 +3,7 @@ FROM arm32v6/alpine:3.15
 ARG VERSION=""
 ARG REVISION=""
 
-RUN apk update && \
-	apk upgrade && \
-	apk add ca-certificates mailcap tree attr && \
-	rm -rf /var/cache/apk/* && \
+RUN apk add --no-cache ca-certificates mailcap tree attr curl && \
 	echo 'hosts: files dns' >| /etc/nsswitch.conf
 
 LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
diff --git a/ocis/docker/Dockerfile.linux.arm64 b/ocis/docker/Dockerfile.linux.arm64
index 09560427301..1b483010a94 100644
--- a/ocis/docker/Dockerfile.linux.arm64
+++ b/ocis/docker/Dockerfile.linux.arm64
@@ -3,10 +3,7 @@ FROM arm64v8/alpine:3.15
 ARG VERSION=""
 ARG REVISION=""
 
-RUN apk update && \
-	apk upgrade && \
-	apk add ca-certificates mailcap tree attr && \
-	rm -rf /var/cache/apk/* && \
+RUN apk add --no-cache ca-certificates mailcap tree attr curl && \
 	echo 'hosts: files dns' >| /etc/nsswitch.conf
 
 LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
diff --git a/protogen/gen/ocis/messages/search/v0/search.pb.go b/protogen/gen/ocis/messages/search/v0/search.pb.go
index 00886394745..dd782bc0371 100644
--- a/protogen/gen/ocis/messages/search/v0/search.pb.go
+++ b/protogen/gen/ocis/messages/search/v0/search.pb.go
@@ -155,7 +155,8 @@ type Entity struct {
 	Type             uint64                 `protobuf:"varint,9,opt,name=type,proto3" json:"type,omitempty"`
 	Deleted          bool                   `protobuf:"varint,10,opt,name=deleted,proto3" json:"deleted,omitempty"`
 	ShareRootName    string                 `protobuf:"bytes,11,opt,name=shareRootName,proto3" json:"shareRootName,omitempty"`
-	Tags             []string               `protobuf:"bytes,12,rep,name=tags,proto3" json:"tags,omitempty"`
+	ParentId         *ResourceID            `protobuf:"bytes,12,opt,name=parent_id,json=parentId,proto3" json:"parent_id,omitempty"`
+	Tags             []string               `protobuf:"bytes,13,rep,name=tags,proto3" json:"tags,omitempty"`
 }
 
 func (x *Entity) Reset() {
@@ -267,6 +268,13 @@ func (x *Entity) GetShareRootName() string {
 	return ""
 }
 
+func (x *Entity) GetParentId() *ResourceID {
+	if x != nil {
+		return x.ParentId
+	}
+	return nil
+}
+
 func (x *Entity) GetTags() []string {
 	if x != nil {
 		return x.Tags
@@ -352,7 +360,7 @@ var file_ocis_messages_search_v0_search_proto_rawDesc = []byte{
 	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x2e, 0x76,
 	0x30, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x44, 0x52, 0x0a, 0x72, 0x65,
 	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x22, 0xa0, 0x03, 0x0a,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x22, 0xe2, 0x03, 0x0a,
 	0x06, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x34, 0x0a, 0x03, 0x72, 0x65, 0x66, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6f, 0x63, 0x69, 0x73, 0x2e, 0x6d, 0x65, 0x73, 0x73,
 	0x61, 0x67, 0x65, 0x73, 0x2e, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x2e, 0x76, 0x30, 0x2e, 0x52,
@@ -377,19 +385,23 @@ var file_ocis_messages_search_v0_search_proto_rawDesc = []byte{
 	0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x64, 0x65,
 	0x6c, 0x65, 0x74, 0x65, 0x64, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x68, 0x61, 0x72, 0x65, 0x52, 0x6f,
 	0x6f, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x68,
-	0x61, 0x72, 0x65, 0x52, 0x6f, 0x6f, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74,
-	0x61, 0x67, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x22,
-	0x56, 0x0a, 0x05, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x37, 0x0a, 0x06, 0x65, 0x6e, 0x74, 0x69,
-	0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6f, 0x63, 0x69, 0x73, 0x2e,
-	0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x2e,
-	0x76, 0x30, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x06, 0x65, 0x6e, 0x74, 0x69, 0x74,
-	0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02,
-	0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75,
-	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x2f, 0x6f,
-	0x63, 0x69, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x67, 0x65, 0x6e, 0x2f,
-	0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x73, 0x2f, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x2f, 0x76, 0x30, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
+	0x61, 0x72, 0x65, 0x52, 0x6f, 0x6f, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x40, 0x0a, 0x09, 0x70,
+	0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23,
+	0x2e, 0x6f, 0x63, 0x69, 0x73, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x73,
+	0x65, 0x61, 0x72, 0x63, 0x68, 0x2e, 0x76, 0x30, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x49, 0x44, 0x52, 0x08, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x12, 0x0a,
+	0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x74, 0x61, 0x67,
+	0x73, 0x22, 0x56, 0x0a, 0x05, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x37, 0x0a, 0x06, 0x65, 0x6e,
+	0x74, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6f, 0x63, 0x69,
+	0x73, 0x2e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x73, 0x65, 0x61, 0x72, 0x63,
+	0x68, 0x2e, 0x76, 0x30, 0x2e, 0x45, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x06, 0x65, 0x6e, 0x74,
+	0x69, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x02, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x77, 0x6e, 0x63, 0x6c, 0x6f, 0x75, 0x64,
+	0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x67, 0x65,
+	0x6e, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x63, 0x69, 0x73, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x73, 0x2f, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x2f, 0x76, 0x30, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -417,12 +429,13 @@ var file_ocis_messages_search_v0_search_proto_depIdxs = []int32{
 	1, // 1: ocis.messages.search.v0.Entity.ref:type_name -> ocis.messages.search.v0.Reference
 	0, // 2: ocis.messages.search.v0.Entity.id:type_name -> ocis.messages.search.v0.ResourceID
 	4, // 3: ocis.messages.search.v0.Entity.last_modified_time:type_name -> google.protobuf.Timestamp
-	2, // 4: ocis.messages.search.v0.Match.entity:type_name -> ocis.messages.search.v0.Entity
-	5, // [5:5] is the sub-list for method output_type
-	5, // [5:5] is the sub-list for method input_type
-	5, // [5:5] is the sub-list for extension type_name
-	5, // [5:5] is the sub-list for extension extendee
-	0, // [0:5] is the sub-list for field type_name
+	0, // 4: ocis.messages.search.v0.Entity.parent_id:type_name -> ocis.messages.search.v0.ResourceID
+	2, // 5: ocis.messages.search.v0.Match.entity:type_name -> ocis.messages.search.v0.Entity
+	6, // [6:6] is the sub-list for method output_type
+	6, // [6:6] is the sub-list for method input_type
+	6, // [6:6] is the sub-list for extension type_name
+	6, // [6:6] is the sub-list for extension extendee
+	0, // [0:6] is the sub-list for field type_name
 }
 
 func init() { file_ocis_messages_search_v0_search_proto_init() }
diff --git a/protogen/gen/ocis/messages/settings/v0/settings.pb.go b/protogen/gen/ocis/messages/settings/v0/settings.pb.go
index 8e08272ef01..b30e14dc3dc 100644
--- a/protogen/gen/ocis/messages/settings/v0/settings.pb.go
+++ b/protogen/gen/ocis/messages/settings/v0/settings.pb.go
@@ -589,6 +589,7 @@ type Setting struct {
 	DisplayName string `protobuf:"bytes,3,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
 	// Types that are assignable to Value:
+	//
 	//	*Setting_IntValue
 	//	*Setting_StringValue
 	//	*Setting_BoolValue
@@ -1193,6 +1194,7 @@ type Value struct {
 	AccountUuid string    `protobuf:"bytes,4,opt,name=account_uuid,json=accountUuid,proto3" json:"account_uuid,omitempty"`
 	Resource    *Resource `protobuf:"bytes,5,opt,name=resource,proto3" json:"resource,omitempty"`
 	// Types that are assignable to Value:
+	//
 	//	*Value_BoolValue
 	//	*Value_IntValue
 	//	*Value_StringValue
@@ -1383,6 +1385,7 @@ type ListOptionValue struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Types that are assignable to Option:
+	//
 	//	*ListOptionValue_StringValue
 	//	*ListOptionValue_IntValue
 	Option isListOptionValue_Option `protobuf_oneof:"option"`
diff --git a/protogen/gen/ocis/services/search/v0/search.swagger.json b/protogen/gen/ocis/services/search/v0/search.swagger.json
index cbcce079c56..38e9809e829 100644
--- a/protogen/gen/ocis/services/search/v0/search.swagger.json
+++ b/protogen/gen/ocis/services/search/v0/search.swagger.json
@@ -196,6 +196,9 @@
         "shareRootName": {
           "type": "string"
         },
+        "parentId": {
+          "$ref": "#/definitions/v0ResourceID"
+        },
         "tags": {
           "type": "array",
           "items": {
diff --git a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go
index 9d0293e6fb5..29930a15bc7 100644
--- a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go
+++ b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go
@@ -37,6 +37,7 @@ type GetThumbnailRequest struct {
 	// The height of the thumbnail
 	Height int32 `protobuf:"varint,4,opt,name=height,proto3" json:"height,omitempty"`
 	// Types that are assignable to Source:
+	//
 	//	*GetThumbnailRequest_WebdavSource
 	//	*GetThumbnailRequest_Cs3Source
 	Source isGetThumbnailRequest_Source `protobuf_oneof:"source"`
diff --git a/protogen/proto/ocis/messages/search/v0/search.proto b/protogen/proto/ocis/messages/search/v0/search.proto
index 2332d897f08..51eac0fd129 100644
--- a/protogen/proto/ocis/messages/search/v0/search.proto
+++ b/protogen/proto/ocis/messages/search/v0/search.proto
@@ -28,8 +28,9 @@ message Entity {
   string permissions = 8;
   uint64 type = 9;
   bool deleted = 10;
-	string shareRootName = 11;
-  repeated string tags = 12;
+  string shareRootName = 11;
+  ResourceID parent_id = 12;
+  repeated string tags = 13;
 }
 
 message Match {
diff --git a/services/frontend/pkg/revaconfig/config.go b/services/frontend/pkg/revaconfig/config.go
index 0328496f7ef..115bd927b95 100644
--- a/services/frontend/pkg/revaconfig/config.go
+++ b/services/frontend/pkg/revaconfig/config.go
@@ -199,7 +199,7 @@ func FrontendConfigFromStruct(cfg *config.Config) (map[string]interface{}, error
 								"default_permissions":               22,
 								"search_min_length":                 cfg.SearchMinLength,
 								"public": map[string]interface{}{
-									"alias":                      false,
+									"alias":                      true,
 									"enabled":                    true,
 									"send_mail":                  true,
 									"defaultPublicLinkShareName": "Public link",
diff --git a/services/graph/pkg/service/v0/drives.go b/services/graph/pkg/service/v0/drives.go
index 6264ab3804e..632c39ee357 100644
--- a/services/graph/pkg/service/v0/drives.go
+++ b/services/graph/pkg/service/v0/drives.go
@@ -648,11 +648,11 @@ func (g Graph) cs3StorageSpaceToDrive(ctx context.Context, baseURL *url.URL, spa
 		drive.Root.WebDavUrl = libregraph.PtrString(webDavURL.String())
 	}
 
-	webURL, err := url.Parse(g.config.Commons.OcisURL)
+	webURL, err := url.Parse(g.config.Spaces.WebDavBase)
 	if err != nil {
 		g.logger.Error().
 			Err(err).
-			Str("url", g.config.Commons.OcisURL).
+			Str("url", g.config.Spaces.WebDavBase).
 			Msg("failed to parse base url")
 		return nil, err
 	}
diff --git a/services/search/Makefile b/services/search/Makefile
index 032a972be33..c5e82af4d10 100644
--- a/services/search/Makefile
+++ b/services/search/Makefile
@@ -24,7 +24,8 @@ docs-generate: config-docs-generate
 include ../../.make/generate.mk
 
 .PHONY: ci-go-generate
-ci-go-generate: # CI runs ci-node-generate automatically before this target
+ci-go-generate:  $(MOCKERY) # CI runs ci-node-generate automatically before this target
+	$(MOCKERY) --dir pkg/engine --output pkg/engine/mocks --case underscore --name Engine
 
 .PHONY: ci-node-generate
 ci-node-generate:
diff --git a/services/search/pkg/engine/bleve.go b/services/search/pkg/engine/bleve.go
index e2cc07cdf53..b896722d870 100644
--- a/services/search/pkg/engine/bleve.go
+++ b/services/search/pkg/engine/bleve.go
@@ -167,6 +167,11 @@ func (b *Bleve) Search(_ context.Context, sir *searchService.SearchIndexRequest)
 			return nil, err
 		}
 
+		pID, err := storagespace.ParseID(getValue[string](hit.Fields, "ParentID"))
+		if err != nil {
+			return nil, err
+		}
+
 		match := &searchMessage.Match{
 			Score: float32(hit.Score),
 			Entity: &searchMessage.Entity{
@@ -176,6 +181,7 @@ func (b *Bleve) Search(_ context.Context, sir *searchService.SearchIndexRequest)
 				},
 				Id:       resourceIDtoSearchID(rID),
 				Name:     getValue[string](hit.Fields, "Name"),
+				ParentId: resourceIDtoSearchID(pID),
 				Size:     uint64(getValue[float64](hit.Fields, "Size")),
 				Type:     uint64(getValue[float64](hit.Fields, "Type")),
 				MimeType: getValue[string](hit.Fields, "MimeType"),
@@ -203,7 +209,7 @@ func (b *Bleve) Upsert(id string, r Resource) error {
 }
 
 // Move updates the resource location and all of its necessary fields.
-func (b *Bleve) Move(id string, target string) error {
+func (b *Bleve) Move(id string, parentid string, target string) error {
 	r, err := b.getResource(id)
 	if err != nil {
 		return err
@@ -214,6 +220,7 @@ func (b *Bleve) Move(id string, target string) error {
 	r, err = b.updateEntity(id, func(r *Resource) {
 		r.Path = newName
 		r.Name = path.Base(newName)
+		r.ParentID = parentid
 	})
 	if err != nil {
 		return err
@@ -283,11 +290,12 @@ func (b *Bleve) getResource(id string) (*Resource, error) {
 	fields := res.Hits[0].Fields
 
 	return &Resource{
-		ID:      getValue[string](fields, "ID"),
-		RootID:  getValue[string](fields, "RootID"),
-		Path:    getValue[string](fields, "Path"),
-		Type:    uint64(getValue[float64](fields, "Type")),
-		Deleted: getValue[bool](fields, "Deleted"),
+		ID:       getValue[string](fields, "ID"),
+		RootID:   getValue[string](fields, "RootID"),
+		Path:     getValue[string](fields, "Path"),
+		ParentID: getValue[string](fields, "ParentID"),
+		Type:     uint64(getValue[float64](fields, "Type")),
+		Deleted:  getValue[bool](fields, "Deleted"),
 		Document: content.Document{
 			Name:     getValue[string](fields, "Name"),
 			Size:     uint64(getValue[float64](fields, "Size")),
diff --git a/services/search/pkg/engine/engine.go b/services/search/pkg/engine/engine.go
index 09f2fe1c09b..5c20c976dec 100644
--- a/services/search/pkg/engine/engine.go
+++ b/services/search/pkg/engine/engine.go
@@ -16,7 +16,7 @@ import (
 type Engine interface {
 	Search(ctx context.Context, req *searchSearvice.SearchIndexRequest) (*searchSearvice.SearchIndexResponse, error)
 	Upsert(id string, r Resource) error
-	Move(id string, target string) error
+	Move(id string, parentid string, target string) error
 	Delete(id string) error
 	Restore(id string) error
 	Purge(id string) error
@@ -27,11 +27,12 @@ type Engine interface {
 type Resource struct {
 	content.Document
 
-	ID      string
-	RootID  string
-	Path    string
-	Type    uint64
-	Deleted bool
+	ID       string
+	RootID   string
+	Path     string
+	ParentID string
+	Type     uint64
+	Deleted  bool
 }
 
 func resourceIDtoSearchID(id storageProvider.ResourceId) *searchMessage.ResourceID {
diff --git a/services/search/pkg/engine/mocks/Engine.go b/services/search/pkg/engine/mocks/engine.go
similarity index 77%
rename from services/search/pkg/engine/mocks/Engine.go
rename to services/search/pkg/engine/mocks/engine.go
index 274d780b7b0..09bb02da01a 100644
--- a/services/search/pkg/engine/mocks/Engine.go
+++ b/services/search/pkg/engine/mocks/engine.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.14.0. DO NOT EDIT.
+// Code generated by mockery v2.10.4. DO NOT EDIT.
 
 package mocks
 
@@ -51,13 +51,13 @@ func (_m *Engine) DocCount() (uint64, error) {
 	return r0, r1
 }
 
-// Move provides a mock function with given fields: id, target
-func (_m *Engine) Move(id string, target string) error {
-	ret := _m.Called(id, target)
+// Move provides a mock function with given fields: id, parentid, target
+func (_m *Engine) Move(id string, parentid string, target string) error {
+	ret := _m.Called(id, parentid, target)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(string, string) error); ok {
-		r0 = rf(id, target)
+	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
+		r0 = rf(id, parentid, target)
 	} else {
 		r0 = ret.Error(0)
 	}
@@ -129,18 +129,3 @@ func (_m *Engine) Upsert(id string, r engine.Resource) error {
 
 	return r0
 }
-
-type mockConstructorTestingTNewEngine interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewEngine creates a new instance of Engine. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewEngine(t mockConstructorTestingTNewEngine) *Engine {
-	mock := &Engine{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/services/search/pkg/search/events.go b/services/search/pkg/search/events.go
index 784b382f588..b376d6ba36d 100644
--- a/services/search/pkg/search/events.go
+++ b/services/search/pkg/search/events.go
@@ -115,6 +115,7 @@ func (eh *eventHandler) upsertItem(ref *provider.Reference, uid *user.UserId) {
 			OpaqueId:  stat.Info.Id.SpaceId,
 			SpaceId:   stat.Info.Id.SpaceId,
 		}),
+		ParentID: storagespace.FormatResourceID(*stat.GetInfo().GetParentId()),
 		Path:     utils.MakeRelativePath(path),
 		Type:     uint64(stat.Info.Type),
 		Document: doc,
@@ -144,7 +145,7 @@ func (eh *eventHandler) moveItem(ref *provider.Reference, uid *user.UserId) {
 		return
 	}
 
-	if err := eh.engine.Move(storagespace.FormatResourceID(*stat.Info.Id), path); err != nil {
+	if err := eh.engine.Move(storagespace.FormatResourceID(*stat.GetInfo().GetId()), storagespace.FormatResourceID(*stat.GetInfo().GetParentId()), path); err != nil {
 		eh.logger.Error().Err(err).Msg("failed to move the changed resource in the index")
 	}
 }
diff --git a/services/web/Makefile b/services/web/Makefile
index fa880e686cd..df2a41bffe8 100644
--- a/services/web/Makefile
+++ b/services/web/Makefile
@@ -1,6 +1,6 @@
 SHELL := bash
 NAME := web
-WEB_ASSETS_VERSION = v5.7.0
+WEB_ASSETS_VERSION = v6.0.0-rc.2
 
 include ../../.make/recursion.mk
 
diff --git a/services/webdav/pkg/service/v0/search.go b/services/webdav/pkg/service/v0/search.go
index 55a6758fe92..6c5a3d66cbd 100644
--- a/services/webdav/pkg/service/v0/search.go
+++ b/services/webdav/pkg/service/v0/search.go
@@ -171,6 +171,13 @@ func matchToPropResponse(ctx context.Context, match *searchmsg.Match) (*propfind
 		SpaceId:   match.Entity.Id.SpaceId,
 		OpaqueId:  match.Entity.Id.OpaqueId,
 	})))
+	if match.Entity.ParentId != nil {
+		propstatOK.Prop = append(propstatOK.Prop, prop.Escaped("oc:file-parent", storagespace.FormatResourceID(provider.ResourceId{
+			StorageId: match.Entity.ParentId.StorageId,
+			SpaceId:   match.Entity.ParentId.SpaceId,
+			OpaqueId:  match.Entity.ParentId.OpaqueId,
+		})))
+	}
 	if match.Entity.Ref.ResourceId.StorageId == utils.ShareStorageProviderID {
 		propstatOK.Prop = append(propstatOK.Prop, prop.Escaped("oc:shareid", match.Entity.Ref.ResourceId.OpaqueId))
 		propstatOK.Prop = append(propstatOK.Prop, prop.Escaped("oc:shareroot", match.Entity.ShareRootName))


Test patch:
diff --git a/services/graph/pkg/service/v0/graph_test.go b/services/graph/pkg/service/v0/graph_test.go
index fcd969c5821..ca7e0087f89 100644
--- a/services/graph/pkg/service/v0/graph_test.go
+++ b/services/graph/pkg/service/v0/graph_test.go
@@ -41,7 +41,6 @@ var _ = Describe("Graph", func() {
 		cfg.Identity.LDAP.CACert = "" // skip the startup checks, we don't use LDAP at all in this tests
 		cfg.TokenManager.JWTSecret = "loremipsum"
 		cfg.Commons = &shared.Commons{}
-		cfg.Commons.OcisURL = "https://ocis.test"
 
 		gatewayClient = &mocks.GatewayClient{}
 		eventsPublisher = mocks.Publisher{}
@@ -112,7 +111,7 @@ var _ = Describe("Graph", func() {
 							"id":"pro-1$sameID",
 							"webDavUrl":"https://localhost:9200/dav/spaces/pro-1$sameID"
 						},
-						"webUrl": "https://ocis.test/f/pro-1$sameID"
+						"webUrl": "https://localhost:9200/f/pro-1$sameID"
 					}
 				]
 			}
@@ -183,7 +182,7 @@ var _ = Describe("Graph", func() {
 							"id":"pro-1$asameID",
 							"webDavUrl":"https://localhost:9200/dav/spaces/pro-1$asameID"
 						},
-						"webUrl": "https://ocis.test/f/pro-1$asameID"
+						"webUrl": "https://localhost:9200/f/pro-1$asameID"
 					},
 					{
 						"driveAlias":"bspacetype/bspacename",
@@ -195,7 +194,7 @@ var _ = Describe("Graph", func() {
 							"id":"pro-1$bsameID",
 							"webDavUrl":"https://localhost:9200/dav/spaces/pro-1$bsameID"
 						},
-						"webUrl": "https://ocis.test/f/pro-1$bsameID"
+						"webUrl": "https://localhost:9200/f/pro-1$bsameID"
 					}
 				]
 			}
diff --git a/services/search/pkg/engine/bleve_test.go b/services/search/pkg/engine/bleve_test.go
index ad01a057757..1a4abd079d4 100644
--- a/services/search/pkg/engine/bleve_test.go
+++ b/services/search/pkg/engine/bleve_test.go
@@ -3,6 +3,7 @@ package engine_test
 import (
 	"context"
 	"fmt"
+
 	"github.com/blevesearch/bleve/v2"
 	sprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 	. "github.com/onsi/ginkgo/v2"
@@ -19,7 +20,7 @@ var _ = Describe("Bleve", func() {
 		idx bleve.Index
 		ctx context.Context
 
-		createEntity = func(id sprovider.ResourceId, doc content.Document) engine.Resource {
+		createEntity = func(id sprovider.ResourceId, parentOpaque string, doc content.Document) engine.Resource {
 			name := doc.Name
 
 			if name == "" {
@@ -29,6 +30,7 @@ var _ = Describe("Bleve", func() {
 			return engine.Resource{
 				ID:       fmt.Sprintf("%s$%s!%s", id.StorageId, id.SpaceId, id.OpaqueId),
 				RootID:   fmt.Sprintf("%s$%s!%s", id.StorageId, id.SpaceId, id.OpaqueId),
+				ParentID: fmt.Sprintf("%s$%s!%s", id.StorageId, id.SpaceId, parentOpaque),
 				Path:     fmt.Sprintf("./%s", name),
 				Document: doc,
 			}
@@ -82,7 +84,7 @@ var _ = Describe("Bleve", func() {
 					SpaceId:   "2",
 					OpaqueId:  "3",
 				}
-				r := createEntity(rid, content.Document{Tags: []string{"foo", "bar"}})
+				r := createEntity(rid, "p", content.Document{Tags: []string{"foo", "bar"}})
 				err := eng.Upsert(r.ID, r)
 				Expect(err).ToNot(HaveOccurred())
 
@@ -102,7 +104,7 @@ var _ = Describe("Bleve", func() {
 					SpaceId:   "2",
 					OpaqueId:  "3",
 				}
-				r := createEntity(rid, content.Document{Name: "Foo oo.pdf"})
+				r := createEntity(rid, "p", content.Document{Name: "Foo oo.pdf"})
 				err := eng.Upsert(r.ID, r)
 				Expect(err).ToNot(HaveOccurred())
 				assertDocCount(rid, `Name:foo o*`, 1)
@@ -114,7 +116,7 @@ var _ = Describe("Bleve", func() {
 					SpaceId:   "2",
 					OpaqueId:  "3",
 				}
-				r := createEntity(rid, content.Document{Name: "12345.pdf"})
+				r := createEntity(rid, "p", content.Document{Name: "12345.pdf"})
 				err := eng.Upsert(r.ID, r)
 				Expect(err).ToNot(HaveOccurred())
 
@@ -128,7 +130,7 @@ var _ = Describe("Bleve", func() {
 						SpaceId:   "2",
 						OpaqueId:  "3",
 					}
-					r := createEntity(rid, content.Document{Name: "foo.pdf"})
+					r := createEntity(rid, "p", content.Document{Name: "foo.pdf"})
 					err := eng.Upsert(r.ID, r)
 					Expect(err).ToNot(HaveOccurred())
 
@@ -147,7 +149,7 @@ var _ = Describe("Bleve", func() {
 					SpaceId:   "2",
 					OpaqueId:  "3",
 				}
-				r := createEntity(rid, content.Document{Name: "bar.pdf", Size: 789})
+				r := createEntity(rid, "p", content.Document{Name: "bar.pdf", Size: 789})
 				err := eng.Upsert(r.ID, r)
 				Expect(err).ToNot(HaveOccurred())
 
@@ -161,7 +163,7 @@ var _ = Describe("Bleve", func() {
 					SpaceId:   "2",
 					OpaqueId:  "3",
 				}
-				r := createEntity(rid, content.Document{Name: "bar.pdf"})
+				r := createEntity(rid, "p", content.Document{Name: "bar.pdf"})
 				err := eng.Upsert(r.ID, r)
 				Expect(err).ToNot(HaveOccurred())
 
@@ -176,7 +178,7 @@ var _ = Describe("Bleve", func() {
 					SpaceId:   "2",
 					OpaqueId:  "3",
 				}
-				r := createEntity(rid, content.Document{Name: "bar.pdf"})
+				r := createEntity(rid, "p", content.Document{Name: "bar.pdf"})
 				r.Type = 3
 				r.MimeType = "application/pdf"
 
@@ -204,7 +206,7 @@ var _ = Describe("Bleve", func() {
 						OpaqueId:  string(rune(i + 3)),
 					}
 
-					r := createEntity(rid, content.Document{Name: "foo.pdf"})
+					r := createEntity(rid, "p", content.Document{Name: "foo.pdf"})
 					r.Size = uint64(i + 250)
 					err := eng.Upsert(r.ID, r)
 					Expect(err).ToNot(HaveOccurred())
@@ -224,7 +226,7 @@ var _ = Describe("Bleve", func() {
 					SpaceId:   "2",
 					OpaqueId:  "3",
 				}
-				r := createEntity(rid, content.Document{Name: "foo.pdf"})
+				r := createEntity(rid, "p", content.Document{Name: "foo.pdf"})
 				r.Type = 3
 				r.MimeType = "application/pdf"
 
@@ -249,7 +251,7 @@ var _ = Describe("Bleve", func() {
 						SpaceId:   "2",
 						OpaqueId:  "3",
 					}
-					entT = createEntity(ridT, content.Document{Name: "top.pdf"})
+					entT = createEntity(ridT, "p", content.Document{Name: "top.pdf"})
 					Expect(eng.Upsert(entT.ID, entT)).ToNot(HaveOccurred())
 
 					ridD = sprovider.ResourceId{
@@ -257,7 +259,7 @@ var _ = Describe("Bleve", func() {
 						SpaceId:   "2",
 						OpaqueId:  "4",
 					}
-					entD = createEntity(ridD, content.Document{Name: "deep.pdf"})
+					entD = createEntity(ridD, "p", content.Document{Name: "deep.pdf"})
 					entD.Path = "./nested/deep.pdf"
 					Expect(eng.Upsert(entD.ID, entD)).ToNot(HaveOccurred())
 				})
diff --git a/services/search/pkg/search/events_test.go b/services/search/pkg/search/events_test.go
index a0ebecc0e13..3f98c3e17ce 100644
--- a/services/search/pkg/search/events_test.go
+++ b/services/search/pkg/search/events_test.go
@@ -2,6 +2,7 @@ package search_test
 
 import (
 	"context"
+
 	gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
 	userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
@@ -47,6 +48,10 @@ var _ = Describe("Events", func() {
 				StorageId: "storageid",
 				OpaqueId:  "opaqueid",
 			},
+			ParentId: &provider.ResourceId{
+				StorageId: "storageid",
+				OpaqueId:  "parentopaqueid",
+			},
 			Path: "foo.pdf",
 			Size: 12345,
 		}
@@ -164,7 +169,7 @@ var _ = Describe("Events", func() {
 
 		It("indexes items when they are being moved", func() {
 			called := false
-			engine.On("Move", mock.Anything, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
+			engine.On("Move", mock.Anything, mock.Anything, mock.Anything).Return(nil).Run(func(args mock.Arguments) {
 				called = true
 			})
 
diff --git a/services/search/pkg/search/provider_test.go b/services/search/pkg/search/provider_test.go
index 68d235d9fe5..16bd13f4059 100644
--- a/services/search/pkg/search/provider_test.go
+++ b/services/search/pkg/search/provider_test.go
@@ -58,6 +58,10 @@ var _ = Describe("Searchprovider", func() {
 				StorageId: "storageid",
 				OpaqueId:  "opaqueid",
 			},
+			ParentId: &sprovider.ResourceId{
+				StorageId: "storageid",
+				OpaqueId:  "parentopaqueid",
+			},
 			Path: "foo.pdf",
 			Size: 12345,
 		}
diff --git a/services/settings/ui/tests/acceptance/pageobjects/filesPageSettingsContext.js b/services/settings/ui/tests/acceptance/pageobjects/filesPageSettingsContext.js
index a2e8beb8bc7..b2ca955c398 100644
--- a/services/settings/ui/tests/acceptance/pageobjects/filesPageSettingsContext.js
+++ b/services/settings/ui/tests/acceptance/pageobjects/filesPageSettingsContext.js
@@ -75,7 +75,7 @@ module.exports = {
       selector: '#account-info-container'
     },
     fileTableHeaderItems: {
-      selector: '//*[@id="files-personal-table"]//th[not(.//div)]',
+      selector: '//*[@id="files-space-table"]//th[not(.//div)]',
       locateStrategy: 'xpath'
     }
   }
diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
index 04054aa5f7c..94d4d3c8c72 100644
--- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md
+++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
@@ -187,12 +187,12 @@ File and sync features in a shared scenario
 
 #### [sharing the shares folder to users exits with different status code than in oc10 backend](https://github.com/owncloud/ocis/issues/2215)
 
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:727](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L727)
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:728](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L728)
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:746](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L746)
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:747](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L747)
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:762](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L762)
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:763](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L763)
+- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:767](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L767)
+- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:768](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L768)
+- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:786](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L786)
+- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:787](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L787)
+- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:802](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L802)
+- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:803](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L803)
 
 #### [file_target of an auto-renamed file is not correct directly after sharing](https://github.com/owncloud/core/issues/32322)
 
@@ -310,7 +310,7 @@ cannot share a folder with create permission
 - [apiShareOperationsToShares1/changingFilesShare.feature:111](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareOperationsToShares1/changingFilesShare.feature#L111)
 - [apiShareOperationsToShares1/changingFilesShare.feature:131](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareOperationsToShares1/changingFilesShare.feature#L131)
 - [apiShareOperationsToShares1/changingFilesShare.feature:132](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareOperationsToShares1/changingFilesShare.feature#L132)
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:500](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L500)
+- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:540](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L540)
 - [apiVersions/fileVersionsSharingToShares.feature:220](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiVersions/fileVersionsSharingToShares.feature#L220)
 - [apiVersions/fileVersionsSharingToShares.feature:221](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiVersions/fileVersionsSharingToShares.feature#L221)
 - [apiWebdavMove2/moveShareOnOcis.feature:30](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavMove2/moveShareOnOcis.feature#L30)
@@ -477,8 +477,8 @@ cannot share a folder with create permission
 
 #### [Share lists deleted user as 'user'](https://github.com/owncloud/ocis/issues/903)
 
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:662](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L662)
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:663](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L663)
+- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:702](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L702)
+- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:703](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L703)
 
 #### [deleting a share with wrong authentication returns OCS status 996 / HTTP 500](https://github.com/owncloud/ocis/issues/1229)
 
@@ -705,8 +705,8 @@ And other missing implementation of favorites
 
 #### [Sharing a same file twice to the same group](https://github.com/owncloud/ocis/issues/1710)
 
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:710](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L710)
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:711](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L711)
+- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:750](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L750)
+- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:751](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L751)
 
 #### [PATCH request for TUS upload with wrong checksum gives incorrect response](https://github.com/owncloud/ocis/issues/1755)
 
@@ -779,8 +779,8 @@ And other missing implementation of favorites
 
 #### [Shares to deleted group listed in the response](https://github.com/owncloud/ocis/issues/2441)
 
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:495](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L495)
-- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:496](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L496)
+- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:535](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L535)
+- [apiShareManagementBasicToShares/createShareToSharesFolder.feature:536](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiShareManagementBasicToShares/createShareToSharesFolder.feature#L536)
 
 #### [copying the file inside Shares folder returns 404](https://github.com/owncloud/ocis/issues/3874)
 
diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage-ocisSmokeTest.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage-ocisSmokeTest.md
index 932d2626149..8c8f7c3be99 100644
--- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage-ocisSmokeTest.md
+++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage-ocisSmokeTest.md
@@ -13,7 +13,3 @@ Only the web scenarios tagged ocisSmokeTest are run by default in OCIS CI. This
 
 ### [Copy private link option not available](https://github.com/owncloud/ocis/issues/1409)
 - [webUIPrivateLinks/accessingPrivateLinks.feature:9](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L9)
-- [webUIPrivateLinks/accessingPrivateLinks.feature:17](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L17)
-
-### [impossible to navigate into a folder in the trashbin](https://github.com/owncloud/web/issues/1725)
-- [webUITrashbinDelete/trashbinDelete.feature:29](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L29)
diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md
index dd154bcb8de..b4b104ef518 100644
--- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md
+++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md
@@ -34,17 +34,6 @@ Other free text and Markdown formatting can be used elsewhere in the document if
 ### [when sharer renames the shared resource, sharee get the updated name](https://github.com/owncloud/ocis/issues/2256)
 - [webUIRenameFiles/renameFiles.feature:234](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L234)
 
-### [No share indicators inside share jail](https://github.com/owncloud/web/issues/6894)
-- [webUISharingInternalUsersSharingIndicator/shareWithUsers.feature:100](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersSharingIndicator/shareWithUsers.feature#L100)
-- [webUISharingInternalUsersSharingIndicator/shareWithUsers.feature:121](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersSharingIndicator/shareWithUsers.feature#L121)
-- [webUISharingPublicManagement/publicLinkIndicator.feature:64](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/publicLinkIndicator.feature#L64)
-- [webUISharingPublicManagement/publicLinkIndicator.feature:81](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/publicLinkIndicator.feature#L81)
-- [webUISharingPublicManagement/publicLinkIndicator.feature:98](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/publicLinkIndicator.feature#L98)
-- [webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature:61](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature#L61)
-- [webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature:80](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature#L80)
-- [webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature:42](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature#L42)
-- [webUISharingInternalUsersSharingIndicator/shareWithUsers.feature:80](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersSharingIndicator/shareWithUsers.feature#L80)
-
 ### [Scoped links](https://github.com/owncloud/web/issues/6844)
 - [webUIFilesCopy/copyPrivateLinks.feature:20](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature#L20)
 - [webUIFilesCopy/copyPrivateLinks.feature:21](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copyPrivateLinks.feature#L21)
@@ -70,11 +59,10 @@ Other free text and Markdown formatting can be used elsewhere in the document if
 
 ### [webUI-Private-Links](https://github.com/owncloud/web/issues/6844)
 - [webUIPrivateLinks/accessingPrivateLinks.feature:9](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L9)
-- [webUIPrivateLinks/accessingPrivateLinks.feature:17](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L17)
 - [webUIPrivateLinks/accessingPrivateLinks.feature:25](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L25)
 
 ### [Share additional info](https://github.com/owncloud/ocis/issues/1253)
-- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:140](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L140)
+- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:138](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L138)
 
 ### [Expiration date set is not implemented in user share](https://github.com/owncloud/ocis/issues/1250)
 - [webUISharingInternalGroups/shareWithGroups.feature:279](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L279)
@@ -98,7 +86,7 @@ Other free text and Markdown formatting can be used elsewhere in the document if
 - [webUISharingPublicManagement/shareByPublicLink.feature:133](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature#L133)
 
 ### [Propfind response to trashbin endpoint is different in ocis](https://github.com/owncloud/product/issues/186)
-- [webUIFilesSearch/search.feature:178](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L178)
+- [webUIFilesSearch/search.feature:131](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L131)
 
 ### [restoring a file from "Deleted files" (trashbin) is not possible if the original folder does not exist any-more](https://github.com/owncloud/web/issues/1753)
 - [webUITrashbinRestore/trashbinRestore.feature:138](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature#L138)
@@ -107,7 +95,7 @@ Other free text and Markdown formatting can be used elsewhere in the document if
 - [webUIUpload/uploadFileGreaterThanQuotaSize.feature:12](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/uploadFileGreaterThanQuotaSize.feature#L12)
 
 ### [restoring a file deleted from a received shared folder is not possible](https://github.com/owncloud/ocis/issues/1124)
-- [webUITrashbinRestore/trashbinRestore.feature:260](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature#L260)
+- [webUITrashbinRestore/trashbinRestore.feature:244](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinRestore/trashbinRestore.feature#L244)
 
 ### [Blocked user is not logged out](https://github.com/owncloud/ocis/issues/902)
 - [webUILogin/adminBlocksUser.feature:13](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUILogin/adminBlocksUser.feature#L13)
@@ -129,18 +117,12 @@ Other free text and Markdown formatting can be used elsewhere in the document if
 - [webUIFilesDetails/fileDetails.feature:106](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L106)
 - [webUIFilesDetails/fileDetails.feature:123](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L123)
 - [webUIFilesDetails/fileDetails.feature:140](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L140)
-- [webUIFilesDetails/fileDetails.feature:169](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L169)
 
 ### [Deletion of a recursive folder from trashbin is not possible](https://github.com/owncloud/product/issues/188)
-- [webUITrashbinDelete/trashbinDelete.feature:85](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L85)
-- [webUITrashbinDelete/trashbinDelete.feature:71](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L71)
-- [webUITrashbinDelete/trashbinDelete.feature:48](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L48)
+- [webUITrashbinDelete/trashbinDelete.feature:51](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L51)
+- [webUITrashbinDelete/trashbinDelete.feature:65](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L65)
 
 ### [Tags page not implemented yet](https://github.com/owncloud/web/issues/5017)
-- [webUIDeleteFilesFolders/deleteFilesFolders.feature:135](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L135)
-- [webUIFilesSearch/search.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L63)
-- [webUIFilesSearch/search.feature:71](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L71)
-- [webUIFilesSearch/search.feature:84](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L84)
 - [webUITags/tagsSuggestion.feature:25](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITags/tagsSuggestion.feature#L25)
 - [webUITags/tagsSuggestion.feature:35](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITags/tagsSuggestion.feature#L35)
 - [webUITags/createTags.feature:16](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITags/createTags.feature#L16)
@@ -150,20 +132,9 @@ Other free text and Markdown formatting can be used elsewhere in the document if
 - [webUITags/createTags.feature:61](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITags/createTags.feature#L61)
 - [webUITags/createTags.feature:79](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITags/createTags.feature#L79)
 
-### [impossible to navigate into a folder in the trashbin](https://github.com/owncloud/web/issues/1725)
-- [webUITrashbinDelete/trashbinDelete.feature:29](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUITrashbinDelete/trashbinDelete.feature#L29)
-
 ### [Saving public share is not possible](https://github.com/owncloud/web/issues/5321)
 - [webUISharingPublicManagement/shareByPublicLink.feature:31](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature#L31)
 
-### [Public link send by email field](https://github.com/owncloud/web/issues/2422)
-- [webUISharingPublicManagement/publicLinkShareByEmail.feature:15](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/publicLinkShareByEmail.feature#L15)
-- [webUISharingPublicManagement/publicLinkShareByEmail.feature:25](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/publicLinkShareByEmail.feature#L25)
-- [webUISharingPublicManagement/publicLinkShareByEmail.feature:41](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/publicLinkShareByEmail.feature#L41)
-- [webUISharingPublicManagement/publicLinkShareByEmail.feature:56](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/publicLinkShareByEmail.feature#L56)
-- [webUISharingPublicManagement/publicLinkShareByEmail.feature:71](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/publicLinkShareByEmail.feature#L71)
-- [webUISharingPublicManagement/publicLinkShareByEmail.feature:99](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/publicLinkShareByEmail.feature#L99)
-
 ### [Uploading folders does not work in files-drop](https://github.com/owncloud/web/issues/2443)
 - [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:247](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L247)
 
@@ -202,64 +173,28 @@ Other free text and Markdown formatting can be used elsewhere in the document if
 - [webUIWebdavLocks/unlock.feature:148](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLocks/unlock.feature#L148)
 - [webUIWebdavLocks/unlock.feature:198](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLocks/unlock.feature#L198)
 - [webUIWebdavLocks/unlock.feature:199](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLocks/unlock.feature#L199)
-- [webUIWebdavLockProtection/delete.feature:32](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/delete.feature#L32)
 - [webUIWebdavLockProtection/delete.feature:33](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/delete.feature#L33)
-- [webUIWebdavLockProtection/delete.feature:53](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/delete.feature#L53)
-- [webUIWebdavLockProtection/delete.feature:54](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/delete.feature#L54)
-- [webUIWebdavLockProtection/move.feature:35](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/move.feature#L35)
+- [webUIWebdavLockProtection/delete.feature:34](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/delete.feature#L34)
 - [webUIWebdavLockProtection/move.feature:36](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/move.feature#L36)
-- [webUIWebdavLockProtection/move.feature:56](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/move.feature#L56)
-- [webUIWebdavLockProtection/move.feature:57](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/move.feature#L57)
-- [webUIWebdavLockProtection/move.feature:79](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/move.feature#L79)
-- [webUIWebdavLockProtection/move.feature:80](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/move.feature#L80)
-- [webUIWebdavLockProtection/move.feature:100](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/move.feature#L100)
-- [webUIWebdavLockProtection/move.feature:101](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/move.feature#L101)
-- [webUIWebdavLockProtection/upload.feature:31](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/upload.feature#L31)
+- [webUIWebdavLockProtection/move.feature:37](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/move.feature#L37)
 - [webUIWebdavLockProtection/upload.feature:32](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/upload.feature#L32)
-- [webUIWebdavLockProtection/upload.feature:51](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/upload.feature#L51)
-- [webUIWebdavLockProtection/upload.feature:52](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/upload.feature#L52)
-- [webUIWebdavLockProtection/upload.feature:71](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/upload.feature#L71)
-- [webUIWebdavLockProtection/upload.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/upload.feature#L72)
-
-### [Resources cannot be locked under ocis](https://github.com/owncloud/ocis/issues/1284)
-- [webUIWebdavLockProtection/delete.feature:73](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/delete.feature#L73)
-- [webUIWebdavLockProtection/delete.feature:74](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/delete.feature#L74)
-- [webUIWebdavLockProtection/move.feature:123](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/move.feature#L123)
-- [webUIWebdavLockProtection/move.feature:124](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/move.feature#L124)
-
-### [Writing to locked files/folders give only a generic error message](https://github.com/owncloud/web/issues/5741)
-- [webUIWebdavLockProtection/upload.feature:90](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/upload.feature#L90)
-- [webUIWebdavLockProtection/upload.feature:91](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/upload.feature#L91)
+- [webUIWebdavLockProtection/upload.feature:33](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIWebdavLockProtection/upload.feature#L33)
 
 ### [Federated shares not showing in shared with me page](https://github.com/owncloud/web/issues/2510)
 - [webUISharingExternal/federationSharing.feature:38](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternal/federationSharing.feature#L38)
 - [webUISharingExternal/federationSharing.feature:166](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingExternal/federationSharing.feature#L166)
 
-### [Upload of folder with same name shows error](https://github.com/owncloud/web/issues/6996)
-- [webUIUpload/upload.feature:129](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L129)
-- [webUIUpload/upload.feature:142](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L142)
-- [webUIUpload/upload.feature:159](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L159)
-- [webUIUpload/uploadEdgecases.feature:69](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/uploadEdgecases.feature#L69)
-
-### [browsing directly to a details tab is not possible](https://github.com/owncloud/web/issues/5464)
-- [webUIFiles/browseDirectlyToDetailsTab.feature:21](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/browseDirectlyToDetailsTab.feature#L21)
-- [webUIFiles/browseDirectlyToDetailsTab.feature:22](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/browseDirectlyToDetailsTab.feature#L22)
-- [webUIFiles/browseDirectlyToDetailsTab.feature:31](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/browseDirectlyToDetailsTab.feature#L31)
-- [webUIFiles/browseDirectlyToDetailsTab.feature:32](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/browseDirectlyToDetailsTab.feature#L32)
-- [webUIFiles/browseDirectlyToDetailsTab.feature:41](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/browseDirectlyToDetailsTab.feature#L41)
-- [webUIFiles/browseDirectlyToDetailsTab.feature:42](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/browseDirectlyToDetailsTab.feature#L42)
-
 ### [reshared share that is shared with a group the sharer is part of shows twice on "Share with me" page](https://github.com/owncloud/web/issues/2512)
-- [webUISharingAcceptShares/acceptShares.feature:32](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L32)
+- [webUISharingAcceptShares/acceptShares.feature:31](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L31)
 
 ### [[oCIS] Received share cannot be deleted/unshared if not shared with full permissions](https://github.com/owncloud/web/issues/5531)
-- [webUISharingAcceptShares/acceptShares.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L50)
-- [webUISharingAcceptShares/acceptShares.feature:162](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L162)
-- [webUISharingAcceptShares/acceptShares.feature:201](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L201)
+- [webUISharingAcceptShares/acceptShares.feature:49](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L49)
+- [webUISharingAcceptShares/acceptShares.feature:161](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L161)
+- [webUISharingAcceptShares/acceptShares.feature:200](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L200)
 
 ### [not possible to overwrite a received shared file](https://github.com/owncloud/ocis/issues/2267)
 - [webUISharingInternalGroups/shareWithGroups.feature:79](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L79)
-- [webUISharingInternalUsers/shareWithUsers.feature:59](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L59)
+- [webUISharingInternalUsers/shareWithUsers.feature:55](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L55)
 
 ### [web config update is not properly reflected after the ocis start](https://github.com/owncloud/ocis/issues/2944)
 - [webUIFiles/breadcrumb.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/breadcrumb.feature#L50)
@@ -277,5 +212,4 @@ Other free text and Markdown formatting can be used elsewhere in the document if
 - [webUIFilesCopy/copy.feature:101](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copy.feature#L101)
 
 ### [PROPFIND to sub-folder of a shared resources with same name gives 404](https://github.com/owncloud/ocis/issues/3859)
-- [webUISharingAcceptShares/acceptShares.feature:245](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L245)
-
+- [webUISharingAcceptShares/acceptShares.feature:244](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L244)