fixed filters and added event handlers