@vadus1 I think after fixing above comments you will not need current organization in partial.