Added auto-rescan when neccessary.