Minor subset and map_field improvement.