Linked entities now appear in the right place