Additional bug fixes - remove possibility for duplicate saved element.

Additional bug fixes - remove possibility for duplicate saved element in
FormElement elements collection.