Improved 20 keV injection system for the heavy-ion-beam diagnostic of the tokamak ISTTOK