Improve space handling in probe names