fixing container_name_matches? for unpredictable ordering