Fix for back button tag change misbehavior