Fix Sections to show up correctly on Directive page
Fix multi-type mappings (to Section, Control, Objective)

* Note: This is a bad fix, and will not work correctly for customizable
  Roles.  It works, however, for the current set of pre-defined Roles.