Add default radio input value consideration, fix plugin selector logic