better handling of links