Many fixes in search