Updated architecture for main search