(chore): analytics changes to labels - closes front#2241