Adds index property to criteria and subjects
Fixes bug that generated too many scores after deleting cols/rows