Added support for multi word task names.