Why don't you put it in the right form to begin with? I'm clearing up your mess in the simplest way possible. That way, you have to put in the effort to actually fix it.
Can you not call small errors messes?
Getting the actual headword wrong is a pretty big mess. It'd be like putting the entry for three at tree.