Modify the Service Addr Query Logic