[Fix] 1. Some tests 2. Code cleanup 3. Filtering feature hooked