Add soft delete; ensure some org_form is always passed to template