Closes #260: fixing DuplicateKeyException when editing Manual Finding
Merge commit '05649f6ba2221dda3385825aaf86ddfccb78f3ff' into HEAD