Improve video matcher logic
(https://trello.com/card/improve-video-matcher-logic/51b0b0a7ffbf85fd02000804/11)