adapted handling
modified calculation and representation of default relation-name