Changed dbSanitize and added TODO