Tweak service collector to work with one query