Refactored subtitles to use (type, id) as the key under the hood. Keep items in type order.