Hot fixes in search