cg_edit_table fixes