Fixed KeywordPicker (Thanks XanderOrtiz)