Deal with multiple semicolon separated dates
Adding cleanup and renaming hotfix