finetune for filter command and event
Merge branch 'origin/3.0'