HSEARCH-917 Fixing whitespaces