Little clean in database and fix