improved radio and checkbox support