correct save/remove behiour of enum indexes ,fixes #2703

Do we have enough other tests for enum in combination with index in place?