add some fixes to search in homeSI