HSEARCH-1307 Style fixes