#10200: Improve bag labels