chore(engine): refactor execution query in DefaultCorrelationHandler

contributes to CAM-664