SAN-205 Adjust Survival Analysis so that it handles new datatypes
-fixes following the pull request comments