[BUGFIX] Two wrong conditions in FormEngine expansion