Handle checkbox types better