Schema update: add "Form Descriptors" subject and mappings from topic categories to subjects