Update address block to use LinkedHashMap for ordering, fixes #119