Fix add/remove keywords.