Fixed bug in setting filename for case of user provided event1 or event2