[TASK] Changed order of top event restriction to reduce function complexity of findDemanded() for event