many changes to support searching stashes *& events