For #1907: fix output of value controls with service