Fixed db issue, pending Hint logic