Fix for links and Video URLs