fix isssues with relational DB