Minor modifications in search