Revert naming style for drop-down
Fix display order of facility preferences