Improve Linking of items to features