ADEN-1417 Remove strict hostpre search