Fixed. Now the DB is normalized