Commercial: Fix Keyword Encoding