fix support for %U and other basic variables in service names