label_map now filters correctly