Port over additional key / change events and fix radio button validation