Consolidate address and port to address in services list