Re: [master 4/8] Fix issues with advanced storage searching.