NZ-85 - Improvements to movie name parsing function