fix search for EStorage
fix search crash for EStorage
fix NPE from switching tabs
refactor