base_index and overlay_index in data_row_overlay_key_search were swapped so that columns are matched against correctly