added multiline filters
fixed merge conflicts