The media links are now more intelligently replaced