Regarding whether a field needs an @Field annotation or an @IndexedEmbedded annotation, HSEARCH-2554 Pull Request Sent should solve this by limiting the use of @IndexedEmbedded to just cases where we want to apply another mapping recursively, and providing a different syntax to apply a bridge on elements of a collection. Previously it could be needed in the latter case, which added a lot to the confusion...