Amend setup.py
Amend RR queries
CIDEVSTC-306: Enhance event queries