fix validation code exists to check just for this org