Update mapping and search logic