HSEARCH-1309

@Sanne jsut for you