Improve the way of tv show detection and cleanup a bit