Improve filtering a bit