Bugfixed keyword plugins