Fix filter key/value pair parsing to allow leading hash symbols
merge master -D org -I include -E exclude: PR 145 (Refactor default filters and whitelisting logic)