some fine tunning and fixes in Search