improve filters handling