Don't show garbage characters in uploaders when there are none. + some minor clean up and improvvements in parsing
update to v1.743