partial #141 - progress on explicit rescan but not first launch