Remove and readd entities if their entity id has changed