added suport to remove links to values