Minor changes in search