story#954, improve the ward filtering