Split id field on Voltage/Current

Sometimes it is PS 1 instead of PS1, this was resulting in duplicates because they were both just "PS"