Everything seems to work except need rescan every load