Update service check query grammar to require quotes for tags
Merge branch 'master' into staging