#1566 | Adding all address fields in the address template