Bugfix: avoid search hits in subsequent fields