Preserve the accordion across redraws. Fix #4