Chnages in search module