Revert "Changed how fields are indexed"

This reverts commit 81612160e521c8a98119a5a48cb13116d08b33eb.
merge