improve address block field fill code