- fix an issue with wrong datastructure in the search index (satasubfields)
- some cleanup