Updated main search