Commercial: Fix Keyword Encoding

This fixes encoding of keywords.
eg. 'Secure + protect' -> 'secure-protect'

/cc @ironsidevsquincy @kenlim