Fixed minor issues in  DBHandler
Merge remote-tracking branch 'origin/master'
Fixed minor issues in  DBHandler