Fix up map-for-search