Performance tweak for container edit