Added support for form element label suffix