Fix some Issue with name of  Image with whitespaces