Modify the Preview button to check for the new Organization logic.