Fixed document and document filter.
Merge branch 'feature/tools' into dev