Made link format match current format more accurately