Adding Value Converter to return uTube
Tidy up and empty checks for value converter