Fix bugs in filtering
Fix the polling logic
Fix the history tailing logic