resolved db issue
fixes from merge