Added detection of service tags in routes