Improve youtube track matching, add embed to track page