Fix issues on empty variable key & value and removed placeholder variables#1531