fix filtering bug
clean ups
prevent unexpected route
remove redundent events