as a side note i think there's a lot of places where we could simplify these templates by looping through a collection rather than writing each control-group declaration in full. you could task this to victorlin.