Main Search Polished