Security refactor - schema filtering.
Merge pull request #1 from petugez/security-fix

Security refactor - schema filtering.