Corrected address handling in service selection

Jira issue: HUBWH-6