Fixes #16 - Keyword filtering