Fixes to matching when using TMDB as a primary agent.