Updated youtube matcher for more support