Correct new/existing index comparison to check all relevent fields