Use new key-value structure to assemble department dropdown list when not using AJAX

See #1011