Andrea rework Rendering and Subtitles + index entries changes