replace all occurrences of workingSet by descriptiveDataSet and fix some other compile errors after model change
ref #7095 Refactor character matrix
ref #7095 UI enhancements