Added datastore query constants
CIDEVSTC-306: Enhancements to resource and association queries
CIDEVSTC-306: Enhance event queries