minor modifications in search