* Fixed duplicated entries in database