Replaced deprecated functions
Prevent existing shows being marked as unmatched during rescan
Another matching fix