Emmanuel Bernard commented on Improvement HSEARCH-2636