Emmanuel Bernard commented on Improvement HSEARCH-1767