PNW-2730 - updated logic to handle empty label use case

PNW-2730 - updated logic to handle empty label use case #59