[ADD] Filters for data and demo data