Added checkbox/radio handling to form utils