Fixed up formatting and some logic for the X-GM-LABELS feature