Fix some bugs that produce wrong service name

No match.