Fix service address generalization