esl-8847 Added support for radio buttons