Improve the Storage summary filtering mechanism [RTFACT-22045]