Index name fix, tweaked field name