[eitb] Improve hds extraction