Fixing url conversion.
Still trying to get all types of links working.