Fix click events & filter