linkhandling improvements