added handling of custom radio buttons