Fix an issue and improve database #positify