Add Honolulu and fix sort order