Issue #131 -- undefined index %orgname%