Improve episode/movie detection

...ions.