3.1.1: improve filters, fix several bugs