HSEARCH-1429: proposal B