Work to fix recovering sort status in headers view (fixes NB#58250).