database changes so db is string null safe