Fix problems in sink command with not supporting spaces / unicode