Emmanuel Bernard commented on Improvement HSEARCH-633