Fixes #6237 : Duplicate keys creating for key/value field from front end...

....