Update query and consumer

Manually merge serviced commit 99c5d31eb55
https://github.com/control-center/serviced/commit/99c5d31eb55b9e57c1d1d1b36cc631540edd109d