Fix some issues if movie already present but took imdb id
Merge branch 'master' into prod