use newer service syntax instead of regex hack