Fix bug with editing existing terms
Fix bug with editing existing terms

The definition and highlights supplied (by the form) weren't being
used. Fixed now.

dellsystem/bookmarker,dellsystem/bookmarker,dellsystem/bookmarker