2000+ movepoints heroes after their death or deleting

Many good points have already been made. Finally, after 30 years, they have seriously started discussing fixing the Heroes from the 2000s. (Although a similar feature was already implemented in one version that we cannot name). If the issue of fixing the Heroes from the 2000s has already been resolved, the question is HOW the fix should look. First of all, regardless of everything, the bug where the same hero keeps appearing in the tavern needs to be fixed; otherwise, the game will be reduced to repeatedly digging up and buying the same hero. Secondly, implement a correct calculation of movement points when buying back a dismissed hero (based on the monster that will be present when the hero arrives at the tavern). The main question is whether it is necessary to prohibit the purchase of heroes who were dismissed earlier? In my opinion, this is unnecessary because the theoretical impossibility of resurrecting killed support heroes will significantly prolong the game on large maps. Also, there should be a reset of bonuses from the stable, etc., for resurrected heroes. Another question is how this should work in single-player mode?