switched to strings in cli-client with '_' instead of ' '