We have a pr open to add variable support for service queries, we should also look into supporting them in the older X-ray queries