Added support for keys contains space or sign