Improve updating of feature & link fields