core-5087 fix template combo value reset on remove template operation