Improve filtering, remove old counter