Improved filter handling, and made heartbeat configurable