search hero, minor fixes