search improoving & some fixes