fixing issues filtering and underscores in labels.