(Bug 3081) Previous commit had an edge case where if someone had blanked a keyword
and then restored it, the old keyword would be lost.  This is fixed.