Added support for spaces in canvas name