improve linking of existing fields