Added simple by-field-value indexing