Add for other actions also
Propose a design for filters
Fix HuanSong's comment