updated to bump 3.1.0
adapted filters to 3.1.0
merge with demo-dev