Fix bug where buttons IDs referred to incorrect rows after re-tiering…

…, resulting in evaluations not correctly getting related to their respective variants on export