FIX: adjust a few other variables to escape them as previously done
FIX: adjust a few other variables to escape them as previously done

orpiske/msg-perf-tool,orpiske/msg-perf-tool,orpiske/msg-perf-tool