some form fixes for switches