Remove p:with-option references
Added c:param-set/c:param to the p:www-form-urldecode step; misc typos