Bug correction on index, does not include any more related fields when the data was setup by the user