Fix #1089 by updating the signal labels and group labels