Guillaume Smet commented on Improvement HSEARCH-917