Issue 239: Make Expand Keywords functional