Improve filters.

Related to #6.