made filters more lenient
merge conf fix