SONATA-201 - Improved address display in front-end