Fix up keyword chooser