Revert "Revert "Unified Storage: Use match all query instead of wildcard for …" This reverts commit 4d9bcc6c44.
4d9bcc6c44