diff --git a/uk/ac/sanger/artemis/chado/ArtemisUtils.java b/uk/ac/sanger/artemis/chado/ArtemisUtils.java
index b40c6b27303612e0e107ed7433770709bcaa5ffc..2c357a12a88cf99ffebf079674e9fce2027e6d89 100644
--- a/uk/ac/sanger/artemis/chado/ArtemisUtils.java
+++ b/uk/ac/sanger/artemis/chado/ArtemisUtils.java
@@ -323,6 +323,7 @@ public class ArtemisUtils
         ";");
 
     analysis.setProgram((String) qualifier_strings.get(0));
+    analysis.setProgramVersion("1.0");
 
     // primary dbxref
     DbXRef dbXRef_1 = new DbXRef();
diff --git a/uk/ac/sanger/artemis/chado/GmodDAO.java b/uk/ac/sanger/artemis/chado/GmodDAO.java
index bf7ad170a40a0c9ed348fd0e30de830712bb7ba9..a9e41d91628999c7baa38168024f2bfb646d90f9 100644
--- a/uk/ac/sanger/artemis/chado/GmodDAO.java
+++ b/uk/ac/sanger/artemis/chado/GmodDAO.java
@@ -150,6 +150,16 @@ public abstract class GmodDAO
   }
  
   
+  public List getFeaturesByOrganism(Organism organism)
+  {
+    return null;
+  }
+  
+  public List getFeaturesByUniqueNames(List name)
+  {
+    return null;  
+  }
+  
   //////
   ////// SchemaDaoI
   //////
diff --git a/uk/ac/sanger/artemis/chado/IBatisDAO.java b/uk/ac/sanger/artemis/chado/IBatisDAO.java
index a177ab2d010fb91f6137dc599111781af53ac4a5..76612f15ec5271af5cfabca74804388d101a6fc6 100644
--- a/uk/ac/sanger/artemis/chado/IBatisDAO.java
+++ b/uk/ac/sanger/artemis/chado/IBatisDAO.java
@@ -943,6 +943,11 @@ public class IBatisDAO extends GmodDAO
     subjectLoc.setFeatureByFeatureId(matchFeature);
     sqlMap.insert("insertFeatureLoc", subjectLoc);
     
+    
+    // insert analysis
+    Integer analysisId =  (Integer) sqlMap.insert("insertAnalysis", analysisFeature.getAnalysis());
+    analysisFeature.getAnalysis().setAnalysisId(analysisId.intValue());
+    
     // insert analysis feature
     matchFeature.setFeatureId(matchFeatureId);
     analysisFeature.setFeature(matchFeature);
diff --git a/uk/ac/sanger/artemis/util/DatabaseDocument.java b/uk/ac/sanger/artemis/util/DatabaseDocument.java
index 4913545b3079601d6d818513c656bafe9ffab762..4de4caecf3d0bb29b885f384115cb13f49e4b23a 100644
--- a/uk/ac/sanger/artemis/util/DatabaseDocument.java
+++ b/uk/ac/sanger/artemis/util/DatabaseDocument.java
@@ -2240,9 +2240,9 @@ public class DatabaseDocument extends Document
       
       schema_list = dao.getOrganisms();
       
-      Organism org = new Organism();
+      /*Organism org = new Organism();
       org.setCommonName("web");
-      schema_list.add(org);
+      schema_list.add(org);*/
       
       final List pg_schemas = dao.getSchema();
       
@@ -2271,6 +2271,12 @@ public class DatabaseDocument extends Document
         final Organism organism = (Organism)it.next();
         String orgName = organism.getCommonName();
         
+        if(orgName == null || orgName.equals(""))
+        {
+          orgName = organism.getGenus() + "." + organism.getSpecies();
+          organism.setCommonName(orgName);
+        }
+        
         // search to see if this is in its own schema
         Iterator schemasIt = pg_schemas.iterator();
         while(schemasIt.hasNext())