#Refinements in episode/event handling
#Refactoring of queries