Minor fix and improvement
Update the db