fixes + improvements of search