Fixing some bugs

Note: switched to TMDB ID instead of IMDB ID because sometimes the latter is missing!