adapt UI, back-end and tests to cope with new flattened subject structure in data model