fixed some issues in FormScopeProvider