Fix Keyword Encoding
Merge pull request #4216 from guardian/kc-keyword-fix

Commercial: Fix Keyword Encoding