fix list, add "-" for disabled fields, some reordering