CIDEVSTC-306: Enhancements to resource and event queries