characeterpicker-plugin: code improvements
Merge pull request #1176 from najor/hotfix-0.24.x-code-improvements

Hotfix 0.24.x code improvements