Convert & Delete/Replace Entity preserving references

now it works