Add filtering in StoreManager