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