improved ODT template, using street and city instead of one address field