refactoring

- move keyword filtering to dslwriter
add missing merge

- add changes to files failed to merge previously