Fix issues with non-modal related record create & update redirecting back to parent