Fix index and support extra fields location

Diosbel Mezquíarequested to merge
issue/entity_type_clone-3452646:3452646-the-extra-fields into 4.0.x

Closes #3452646

Merge request reports