HSEARCH-1296 Refactoring