fix db issue
more changes