issues-1 Added filtering & manual set events.