Minor fixes in search