Better item links management