added handling space in tags