Fixes in search