List and Map Search Revamp