Fixing issues with incomplete db entries

Fixing errors with incomplete db entries