Added separate handling for tv and movies