Fix issues from last merge, add addr_format parser for fi_info.