Fix find regexes, improve hot-single