Fixed all issues when DB is empty