HSEARCH-436 Extracting annotation scanning from DocumentBuilders