FIX issue #19 where multiple widget values led to bad replacements in the command