better handling of service destination variables