Improve filters + last DB