po: re-scan in scan hook rather than using the rescan hook that won't be added.