Finalising some field names, and reducing unnecessary duplication of
text indexes.
Removed duplicate dependency.