improve filter prepare
improve events object
fix demo