diff --git a/lib/Command/Scan.php b/lib/Command/Scan.php
index f5dc7e201..206c2458e 100644
--- a/lib/Command/Scan.php
+++ b/lib/Command/Scan.php
@@ -23,7 +23,7 @@
 
 namespace OCA\GroupFolders\Command;
 
-use OC\Files\ObjectStore\NoopScanner;
+use OC\Files\ObjectStore\ObjectStoreScanner;
 use OCP\Constants;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
@@ -84,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 			$scanner = $mount->getStorage()->getScanner();
 
 			$output->writeln("Scanning group folder with id\t<info>{$folder['id']}</info>", OutputInterface::VERBOSITY_VERBOSE);
-			if ($scanner instanceof NoopScanner) {
+			if ($scanner instanceof ObjectStoreScanner) {
 				$output->writeln("Scanning group folders using an object store as primary storage is not supported.");
 				return -1;
 			}
diff --git a/lib/Helper/LazyFolder.php b/lib/Helper/LazyFolder.php
index 13ae2364f..ad4d0292b 100644
--- a/lib/Helper/LazyFolder.php
+++ b/lib/Helper/LazyFolder.php
@@ -159,6 +159,10 @@ public function searchByTag($tag, $userId) {
 		return $this->__call(__FUNCTION__, func_get_args());
 	}
 
+	public function searchBySystemTag(string $tagName, string $userId, int $limit = 0, int $offset = 0) {
+		return $this->__call(__FUNCTION__, func_get_args());
+	}
+
 	public function getById($id) {
 		return $this->__call(__FUNCTION__, func_get_args());
 	}
diff --git a/lib/Mount/GroupFolderStorage.php b/lib/Mount/GroupFolderStorage.php
index 901360ce2..694c9987f 100644
--- a/lib/Mount/GroupFolderStorage.php
+++ b/lib/Mount/GroupFolderStorage.php
@@ -22,7 +22,7 @@
 namespace OCA\GroupFolders\Mount;
 
 use OC\Files\Cache\Scanner;
-use OC\Files\ObjectStore\NoopScanner;
+use OC\Files\ObjectStore\ObjectStoreScanner;
 use OC\Files\ObjectStore\ObjectStoreStorage;
 use OC\Files\Storage\Wrapper\Quota;
 use OCP\Files\Cache\ICacheEntry;
@@ -76,7 +76,7 @@ public function getScanner($path = '', $storage = null) {
 			$storage = $this;
 		}
 		if ($storage->instanceOfStorage(ObjectStoreStorage::class)) {
-			$storage->scanner = new NoopScanner($storage);
+			$storage->scanner = new ObjectStoreScanner($storage);
 		} elseif (!isset($storage->scanner)) {
 			$storage->scanner = new Scanner($storage);
 		}
diff --git a/tests/stub.phpstub b/tests/stub.phpstub
index a68493644..6181930bd 100644
--- a/tests/stub.phpstub
+++ b/tests/stub.phpstub
@@ -415,7 +415,7 @@ namespace OC\Core\Command {
 
 namespace OC\Files\ObjectStore {
     use OC\Files\Cache\Scanner;
-	class NoopScanner extends Scanner {}
+	class ObjectStoreScanner extends Scanner {}
 }
 
 namespace Symfony\Component\Console\Helper {