RAZ-2299: Smartfolder issue - Saved Searches goes across tenants