Issue #7: Fixed - FAA preferred units added