fix current_form_columns for subforms