Reinstated bug fix for reused views on choice mode switch