Several fixes and improvements in the characterpicker-plugin

(only the last commit should be part of the pull-request; the rest of the commits is already in the release, but not yet in the hotfix-branch)