diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..597d331
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,226 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+SiteSearchData produces and loads data for VEuPathDB site search Solr cores. It consists of a specialized WDK (Web Development Kit) model that represents component database data as Solr documents, along with programs to generate and load these documents.
+
+The data complies with the [VEuPathDB Site Search solr schema](https://github.com/VEuPathDB/SolrDeployment/blob/master/configsets/site-search/conf).
+
+## Architecture
+
+### Core Components
+
+1. **WDK Model** (`Model/lib/wdk/`)
+   - Specialized WDK model describing how component database data is represented as Solr documents
+   - Separated by cohort/project type:
+     - `ApiCommon/` - Genomics sites (genes, ESTs, pathways, organisms, etc.)
+     - `OrthoMCL/` - OrthoMCL-specific records (groups, sequences)
+     - `EDA/` - EDA (Exploratory Data Analysis) sites
+     - `Portal/` - Portal-specific records
+     - `Shared/` - Shared records (datasets)
+   - Each cohort has:
+     - `siteSearchModel.xml` - Main model file (imports other XMLs)
+     - `siteSearchRecords.xml` - Record class definitions
+     - `*Queries.xml` - ID, vocab, attribute, and table queries
+
+2. **Data Generation Scripts** (`Model/bin/`)
+   - `dumpApiCommonWdkBatchesForSolr` - Dumps all genomics WDK record classes
+   - `dumpOrthomclWdkBatchesForSolr` - Dumps OrthoMCL batches
+   - `dumpEdaWdkBatchesForSolr` - Dumps EDA batches
+   - `ssCreateWdkRecordsBatch` - Core batch creation (called by dump scripts)
+   - `ssCreateDocumentCategoriesBatch` - Creates metadata batch for document types
+   - `ssCreateDocumentFieldsBatch` - Creates metadata batch for document fields
+   - `ssCreateWdkMetaBatch` - Creates batch for WDK searches metadata
+
+3. **Data Loading Scripts** (`Model/bin/`)
+   - `ssLoadBatch` - Loads a single batch into Solr with validation
+   - `ssLoadMultipleBatches` - Recursively discovers and loads multiple batches
+   - `ssCommitSuggesterIndex` - Commits the typeahead index
+
+4. **Metadata** (`Model/data/`)
+   - `documentTypeCategories.json` - Hard-coded metadata describing document types and categories
+   - `nonWdkDocumentFields.json` - Field metadata for non-WDK documents (e.g., Jekyll documents)
+
+5. **Configuration Templates** (`Model/config/`)
+   - `gus.config.tmpl` - Template for GUS database configuration
+   - `SiteSearchData/model.prop.tmpl` - Model properties template
+   - `SiteSearchData/model-config.xml.tmpl` - Model database connections template
+
+6. **Java Source** (`Model/src/main/java/org/eupathdb/sitesearch/`)
+   - `wsfplugin/CommunityStudyIdsPlugin.java` - WSF plugin for community studies
+   - `data/model/report/SolrLoaderReporter.java` - WDK reporter that generates Solr JSON
+
+### Batch System
+
+All data is dumped and loaded in **batches** to ensure validity and trackability. Each batch:
+- Lives in a directory: `solr-json-batch_[batch-type]_[batch-name]_[timestamp]`
+  - Example: `solr-json-batch_organism_pfal3D7_1234567890`
+- Contains:
+  - Multiple `[document-type].json` files with Solr documents
+  - Single `batch.json` file describing the batch (metadata)
+  - Single `DONE` file indicating completion
+- Each document includes batch metadata (type, name, timestamp)
+
+### WDK Model Rules (CRITICAL)
+
+The Site Search WDK Model follows strict rules documented in `Model/lib/wdk/README.md`. Key requirements:
+
+**Record Classes must:**
+- Have exactly one associated `<Question>`
+- Have `urlName` matching the parallel record class in the website's WDK model
+- Include exactly one reporter: `SolrLoaderReporter`
+- Use sentence case for `displayName`
+- Have a `<propertyList>` with a "batch" property (from [enumsConfig.xml](https://github.com/VEuPathDB/SolrDeployment/blob/master/configsets/site-search/conf/enumsConfig.xml))
+- Use only `<attributeQueryRef>`s and `<table>`s
+- Include internal `project` attribute only if records are segmented by project in Solr
+- Include internal `organismsForFilter` table only if searchable by organism
+- Include internal `display_name` attribute
+
+**QuerySets must:**
+- Set `isCacheable="false"`
+
+**AttributeQueryRefs must:**
+- Only include `name` and `displayName` XML properties
+- Never change `name` (invalidates UserDB strategies)
+- Use sentence case for `displayName`
+- May include property lists: `isSummary`, `isSubtitle`, `isSearchable`, `includeProjects`, `boost`
+
+**Tables must:**
+- Follow same rules as attributeQueryRefs
+- Have `<columnAttribute>`s with only `name` property
+- Only include text-searchable columns
+
+**Questions must:**
+- Have zero or one parameters
+
+## Build and Deployment
+
+### Building
+
+```bash
+# Maven build (compiles Java sources, packages JAR)
+mvn clean install
+
+# Ant build (installs to GUS_HOME)
+ant SiteSearchData-Installation
+
+# Docker build (builds container with dependencies)
+make build
+```
+
+The build system depends on:
+- FgpUtil (https://github.com/EuPathDB/FgpUtil.git)
+- WDK (https://github.com/EuPathDB/WDK.git)
+- WSF (https://github.com/EuPathDB/WSF.git)
+- install (https://github.com/EuPathDB/install.git)
+
+### Running Scripts
+
+Scripts require GUS_HOME setup and the scripts directory in PATH:
+
+```bash
+export GUS_HOME=/path/to/gus_home
+export PATH=$PATH:$GUS_HOME/bin
+```
+
+### Configuration
+
+Before running, configure `$GUS_HOME/config/` with:
+1. `gus.config` - Component database connection
+2. `SiteSearchData/model-config.xml` - appDB, userDB, accountDB connections
+3. `SiteSearchData/model.prop` - Model properties
+
+Templates are in `Model/config/`.
+
+### Testing
+
+Unit test for `ssLoadBatch`:
+```bash
+cd Model/test
+./test_ssLoadBatch [core_url]
+```
+
+Requires empty Solr core. Set `SOLR_USER` and `SOLR_PASSWORD` if using basic auth.
+
+### Tagging
+
+**IMPORTANT:** Create a new git tag every time the model is updated. This is required to rebuild the SiteSearchData container image via the `jenkins_presenter_updater` job.
+
+## Common Workflows
+
+### Dumping Data for a Site
+
+```bash
+# For genomics sites
+dumpApiCommonWdkBatchesForSolr [organism_batch_name] [other_params]
+
+# For OrthoMCL
+dumpOrthomclWdkBatchesForSolr [params]
+
+# For EDA sites
+dumpEdaWdkBatchesForSolr [params]
+```
+
+### Creating Metadata Batches
+
+```bash
+# Document type categories
+ssCreateDocumentCategoriesBatch [output_dir]
+
+# Document fields
+ssCreateDocumentFieldsBatch [wdk_service_url] [output_dir]
+
+# WDK searches metadata
+ssCreateWdkMetaBatch [site_url] [output_dir]
+```
+
+### Loading Data into Solr
+
+```bash
+# Single batch
+ssLoadBatch [solr_core_url] [batch_dir] [--replace]
+
+# Multiple batches (recursive discovery)
+ssLoadMultipleBatches [solr_core_url] [root_dir]
+
+# Commit suggester index
+ssCommitSuggesterIndex [solr_core_url]
+```
+
+### Testing Loaded Data
+
+```bash
+# Test WDK record counts in Solr against component database
+testSiteSearchWdkRecordCounts [site_url] [solr_core_url]
+
+# Test all ApiCommon QA sites (must run from VEuPathDB server)
+testApiCommonQaSites
+```
+
+## Local Development
+
+See `local-loading-notes.adoc` for detailed instructions on:
+- Setting up minimal GUS_HOME
+- Running local Solr instance
+- Loading batches from remote builds
+
+## Dependencies
+
+Maven dependencies include:
+- WDK model and service
+- FgpUtil (core, json, server)
+- Jersey containers (Grizzly2, server)
+- JSON processing
+- Log4j
+
+## File Locations
+
+- WDK Model XMLs: `Model/lib/wdk/[cohort]/`
+- Scripts: `Model/bin/`
+- Java sources: `Model/src/main/java/org/eupathdb/sitesearch/`
+- Metadata: `Model/data/`
+- Config templates: `Model/config/`
+- Tests: `Model/test/`
+- Docker: `dockerfiles/`
diff --git a/Model/bin/dumpApiCommonWdkBatchesForSolr b/Model/bin/dumpApiCommonWdkBatchesForSolr
index 5217ea2..e980ffe 100755
--- a/Model/bin/dumpApiCommonWdkBatchesForSolr
+++ b/Model/bin/dumpApiCommonWdkBatchesForSolr
@@ -28,7 +28,7 @@ my $modelProps = SiteSearchData::Model::Utils::getPropsFromFile("$ENV{GUS_HOME}/
 my $dbh = SiteSearchData::Model::Utils::getDbh($gusProps);
 
 SiteSearchData::Model::Utils::runWdkReport($wdkServiceUrl, $targetDir, $BATCH_DIR_PREFIX, "pathway", $modelProps->{PROJECT_ID});
-SiteSearchData::Model::Utils::runWdkReport($wdkServiceUrl, $targetDir, $BATCH_DIR_PREFIX, "popset-isolate", $modelProps->{PROJECT_ID});
+#SiteSearchData::Model::Utils::runWdkReport($wdkServiceUrl, $targetDir, $BATCH_DIR_PREFIX, "popset-isolate", $modelProps->{PROJECT_ID});
 SiteSearchData::Model::Utils::runWdkReport($wdkServiceUrl, $targetDir, $BATCH_DIR_PREFIX, "compound", $modelProps->{PROJECT_ID});
 SiteSearchData::Model::Utils::runWdkReport($wdkServiceUrl, $targetDir, $BATCH_DIR_PREFIX, "dataset-presenter", $modelProps->{PROJECT_ID});
 
diff --git a/Model/lib/wdk/ApiCommon/compoundQueries.xml b/Model/lib/wdk/ApiCommon/compoundQueries.xml
index 49e6f13..43efe0a 100644
--- a/Model/lib/wdk/ApiCommon/compoundQueries.xml
+++ b/Model/lib/wdk/ApiCommon/compoundQueries.xml
@@ -7,7 +7,7 @@
       <sql>
         <![CDATA[
             select source_id
-            from apidbTuning.CompoundAttributes
+            from webready.CompoundAttributes
         ]]>
       </sql>
     </sqlQuery>
@@ -21,7 +21,7 @@
       <sql>
         <![CDATA[
           select source_id, source_id as old_source_id
-          from apidbTuning.CompoundAttributes
+          from webready.CompoundAttributes
         ]]>
       </sql>
     </sqlQuery>
@@ -37,7 +37,7 @@
         <![CDATA[
           select source_id, compound_name, definition,
                  other_names, formula, '@PROJECT_ID@' as project
-          from apidbTuning.CompoundAttributes
+          from webready.CompoundAttributes
         ]]>
       </sql>
     </sqlQuery>
@@ -51,8 +51,8 @@
       <column name="value"/>
       <sql>
         <![CDATA[
-            select ca.source_id, struct.type, to_char(struct.structure) as value
-            from apidbTuning.CompoundAttributes ca, chebi.Structures struct
+            select ca.source_id, struct.type, struct.structure::text as value
+            from webready.CompoundAttributes ca, chebi.Structures struct
             where ca.id = struct.compound_id
               and struct.dimension = '1D'
           union
@@ -62,7 +62,7 @@
                        then REGEXP_REPLACE(cd.chemical_data,'(\d)','<sub>\1</sub>')
                      else chemical_data
                    end as value
-            from apidbTuning.CompoundAttributes ca, chebi.chemical_data cd
+            from webready.CompoundAttributes ca, chebi.chemical_data cd
             where ca.id = cd.compound_id
         ]]>
       </sql>
@@ -74,7 +74,7 @@
       <sql>
         <![CDATA[
           select ca.source_id, n.name as value
-          from apidbTuning.CompoundAttributes ca, chebi.names n
+          from webready.CompoundAttributes ca, chebi.names n
           where ca.id = n.compound_id
             and n.type='IUPAC NAME'
         ]]>
@@ -87,7 +87,7 @@
       <sql>
         <![CDATA[
           select source_id, definition
-          from apidbTuning.CompoundAttributes
+          from webready.CompoundAttributes
         ]]>
       </sql>
     </sqlQuery>
@@ -99,7 +99,7 @@
       <sql>
         <![CDATA[
           select cid.compound as source_id, cid.id as value
-          from apidbTuning.CompoundId cid
+          from webready.CompoundId cid
           where cid.type ='synonym'
         ]]>
       </sql>
@@ -114,7 +114,7 @@
         <![CDATA[
            select distinct pc.chebi_accession as source_id, pr.enzyme as ec_number,
                            pr.substrates_text, pr.products_text
-           from apidbTuning.PathwayCompounds pc, apidbTuning.PathwayReactions pr
+           from webready.PathwayCompounds pc, webready.PathwayReactions pr
            where pc.reaction_id = pr.reaction_id
              and pc.ext_db_name = pr.ext_db_name
              and pc.ext_db_version = pr.ext_db_version
@@ -132,8 +132,8 @@
                           pa.source_id as pathway_source_id,
                           pa.name as pathway_name, pa.pathway_source,
                           pr.reaction_source_id
-          from apidbTuning.PathwayCompounds pc, apidbTuning.PathwayReactions pr,
-               apidbTuning.PathwayAttributes pa
+          from webready.PathwayCompounds pc, webready.PathwayReactions pr,
+               webready.PathwayAttributes pa
           where pc.pathway_id = pa.pathway_id
             and pr.reaction_id = pc.reaction_id
             and pc.chebi_accession is not null
@@ -150,16 +150,16 @@
         <![CDATA[
           with tp_ec
           as (select distinct ec_number_gene
-              from apidbTuning.TranscriptPathway),
+              from webready.TranscriptPathway_p),
           wildcarded_pathway_ec
           as (select distinct enzyme
-              from apidbTuning.PathwayReactions
+              from webready.PathwayReactions
               where enzyme like '%.%.%.%'
                 and enzyme like '%-%'
                 and enzyme != '-.-.-.-'),
           unwildcarded_pathway_ec
           as (select distinct enzyme
-              from apidbTuning.PathwayReactions
+              from webready.PathwayReactions
               where enzyme like '%.%.%.%'
                 and enzyme not like '%-%'),
           ec_match
@@ -171,8 +171,8 @@
                 from tp_ec te, unwildcarded_pathway_ec upe
                 where te.ec_number_gene = upe.enzyme)
           select distinct ca.source_id, tp.gene_source_id, ga.product, ga.name as gene_name
-          from apidbTuning.TranscriptPathway tp, apidbTuning.PathwayReactions pr,
-               apidbTuning.PathwayCompounds pc, apidbTuning.CompoundAttributes ca,
+          from webready.TranscriptPathway_p tp, webready.PathwayReactions pr,
+               webready.PathwayCompounds pc, webready.CompoundAttributes ca,
                ec_match em, apidbTuning.GeneAttributes ga
           where tp.ec_number_gene = em.ec_number_gene
             and em.enzyme = pr.enzyme
diff --git a/Model/lib/wdk/ApiCommon/estQueries.xml b/Model/lib/wdk/ApiCommon/estQueries.xml
index 8773ad3..a1af114 100644
--- a/Model/lib/wdk/ApiCommon/estQueries.xml
+++ b/Model/lib/wdk/ApiCommon/estQueries.xml
@@ -9,7 +9,7 @@
         <![CDATA[
           select distinct ea.source_id
           from apidb.Organism o,
-               sres.TaxonName tn, apidbTuning.EstAttributes ea,
+               sres.TaxonName tn, webready.EstAttributes_p ea,
                (
                   select ts.taxon_id as representative_taxon_id,
                          ts.species_taxon_id as taxon_id
@@ -41,6 +41,7 @@
             and taxmap.taxon_id = tn.taxon_id
             and tn.name = ea.organism
             and o.abbrev = $$organismAbbrev$$
+            and ea.org_abbrev = $$organismAbbrev$$
         ]]>
       </sql>
     </sqlQuery>
@@ -82,7 +83,8 @@
       <sql>
         <![CDATA[
           select source_id, dbest_name, vector, stage, organism, '@PROJECT_ID@' as project
-          from apidbTuning.EstAttributes
+          from webready.EstAttributes_p
+--	  where org_abbrev in (%%xxxxPARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -97,7 +99,8 @@
       <sql>
         <![CDATA[
           select source_id, source_id as old_source_id
-          from apidbTuning.EstAttributes
+          from webready.EstAttributes_p
+--	  where org_abbrev in (%%xxxxPARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
diff --git a/Model/lib/wdk/ApiCommon/geneQueries.xml b/Model/lib/wdk/ApiCommon/geneQueries.xml
index 0c10ff3..3cc2edf 100644
--- a/Model/lib/wdk/ApiCommon/geneQueries.xml
+++ b/Model/lib/wdk/ApiCommon/geneQueries.xml
@@ -40,6 +40,16 @@
 
 
   <querySet name="GeneAttributes" queryType="attribute" isCacheable="false">
+    <!-- Used by WDK to replace %%PARTITION_KEYS%% macro with the keys for a result set -->
+    <sqlQuery name="PartitionKeys">
+      <column name="source_id"/>
+      <column name="partition_id"/>
+      <sql>
+        <![CDATA[
+         select source_id, org_abbrev as partition_key from apidbtuning.GeneOrgAbbrev
+        ]]>
+      </sql>  
+    </sqlQuery>
 
     <sqlQuery name="GeneAlias">
       <column name="source_id"/>
@@ -47,8 +57,9 @@
       <sql>
         <![CDATA[
           select a.gene AS source_id, a.id as old_source_id
-          from apidbTuning.GeneId a
+          from webready.GeneId_p a
           where a.unique_mapping = 1
+            and a.org_abbrev IN (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -69,9 +80,11 @@
         <![CDATA[
           select source_id, product, name, gene_type,
                  sequence_id, organism as organism_full, organism,
-                 orthomcl_name, so_id, so_term_name,
-                 '@PROJECT_ID@' as projectAux 
-          from apidbTuning.GeneAttributes
+                 group_id as orthomcl_name, so_id, so_term_name,
+                 '@PROJECT_ID@' as projectAux
+          from webready.GeneAttributes_p ga 
+          left join webready.geneorthologgroup g ON ga.source_id = g.gene_id
+          where ga.org_abbrev IN (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -85,13 +98,12 @@
       <column name="comment_id"/>
       <sql>
         <![CDATA[
-          select tsc.source_id, tsc.comment_id
-          from apidb.TextSearchableComment@COMMENT_DBLINK@ tsc,
-               @COMMENT_SCHEMA@MappedComment@COMMENT_DBLINK@ mc
-          where mc.comment_id = tsc.comment_id
-            and tsc.comment_target_type = 'gene'
+          select c.stable_id as source_id, c.comment_id
+          from @REMOTE_COMMENT_SCHEMA@MappedComment mc, @REMOTE_COMMENT_SCHEMA@comments c
+          where mc.comment_id = c.comment_id
+            and c.comment_target_id = 'gene'
             and mc.review_status_id != 'rejected'
-            and mc.is_visible = 1
+            and mc.is_visible = true
         ]]>
       </sql>
     </sqlQuery>
@@ -101,13 +113,21 @@
       <column name="content"/>
       <sql>
         <![CDATA[
-          select tsc.source_id, tsc.content
-          from apidb.textsearchablecomment@COMMENT_DBLINK@ tsc,
-               @COMMENT_SCHEMA@mappedComment@COMMENT_DBLINK@ mc
+          select tsc.stable_id as source_id, tsc.cntnt
+          from @REMOTE_COMMENT_SCHEMA@MappedComment mc,
+	  (select stable_id, comment_target_id, c.comment_id,
+	   concat(headline, '|', content, '|', first_name, ' ', last_name, '(', organization, ')', authors) as cntnt
+	   from @REMOTE_COMMENT_SCHEMA@comments c
+	   left join @REMOTE_COMMENT_SCHEMA@comment_users u on  c.user_id = u.user_id
+	   left join (select comment_id, string_agg(source_id, ', ' order by source_id) as authors
+                      from @REMOTE_COMMENT_SCHEMA@CommentReference
+                      where database_name = 'author'
+		      group by comment_id) a on a.comment_id = c.comment_id
+	  ) tsc
           where mc.comment_id = tsc.comment_id
-            and tsc.comment_target_type = 'gene'
+            and tsc.comment_target_id = 'gene'
             and mc.review_status_id != 'rejected'
-            and mc.is_visible = 1
+            and mc.is_visible = true
         ]]>
       </sql>
     </sqlQuery>
@@ -138,7 +158,8 @@
       <sql>
         <![CDATA[
           select ta.gene_source_id as source_id, ta.protein_source_id
-          from apidbTuning.TranscriptAttributes ta
+          from webready.TranscriptAttributes_p ta
+          where ta.org_abbrev IN (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -151,7 +172,8 @@
         <!-- transcripts must be ordered alphabetically, as expected by client -->
         <![CDATA[
           select gene_source_id as source_id, source_id as transcript_id
-          from apidbTuning.TranscriptAttributes
+          from webready.TranscriptAttributes_p
+          where org_abbrev IN (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -162,7 +184,8 @@
       <sql>
         <![CDATA[
           select source_id, organism
-          from apidbTuning.GeneAttributes
+          from webready.GeneAttributes_p
+          where org_abbrev IN (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -172,38 +195,15 @@
       <column name="source_id"/>
       <column name="ec_number"/>
       <column name="ec_description"/>
-      <column name="ec_source"/>
-      <column name="expasy_url"/>
-
       <sql>
         <![CDATA[
           select ta.gene_source_id AS source_id, ec.ec_number,
-                 ec.description AS ec_description,
-                 decode(asec.evidence_code,
-                        'OrthoMCLDerived', 'computationally inferred from orthology',
-                        'gb', 'GenBank',
-                        'Hagai', 'MPMP',
-                        evidence_code)
-                   as ec_source,
-                 'http://enzyme.expasy.org/cgi-bin/enzyme/enzyme-search-ec?field1='
-                   || ec.ec_number_1
-                   || decode(ec.ec_number_2,
-                             null, null,
-                             chr(38) || 'field2=' || ec.ec_number_2)
-                   || decode(ec.ec_number_3,
-                             null, null,
-                             chr(38) || 'field3=' || ec.ec_number_3)
-                   || decode(ec.ec_number_4,
-                             null, null,
-                             chr(38) || 'field4=' || ec.ec_number_4)
-                   as expasy_url
-          from apidbTuning.TranscriptAttributes ta, sres.enzymeclass ec,
+                 ec.description AS ec_description
+          from webready.TranscriptAttributes_p ta, sres.enzymeclass ec,
                dots.AaSequenceEnzymeClass asec
           where ta.aa_sequence_id = asec.aa_sequence_id
             and asec.enzyme_class_id = ec.enzyme_class_id
-          group by ta.gene_source_id, ec.ec_number, ec.description,
-                   asec.evidence_code,
-                   ec.ec_number_1, ec.ec_number_2, ec.ec_number_3, ec.ec_number_4
+            and ta.org_abbrev IN (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -216,69 +216,12 @@
       <column name="source_id"/>
       <column name="go_id"/>
       <column name="go_term_name"/>
-      <column name="ontology"/>
-      <column name="source"/>
-      <column name="evidence_code"/>
       <column name="reference"/>
-      <column name="evidence_code_parameter"/>
-      <column name="sort_key"/>
       <sql>
         <![CDATA[
-          select source_id, go_id,  go_term_name, ontology,
-                 source, evidence_code, reference, evidence_code_parameter
-          from (-- makeup of GeneGoTable tuning table
-                select source_id, go_id,
-                       max(go_term_name) as go_term_name, ontology, source, evidence_code,
-                       reference, evidence_code_parameter
-                from (select distinct ggt.gene_source_id as source_id,
-                                      replace(ggt.go_id, 'GO_', 'GO:') as go_id,
-                                      ggt.transcript_source_id,
-                                      ggt.go_term_name, ggt.ontology, ggt.source,
-                                      ggt.evidence_code, ggt.reference,
-                                      ggt.evidence_code_parameter
-                      from (-- makeup of GeneGoTerms tuning table
-                            with root_term
-                                 as (select ontology_term_id,
-                                            cast(initcap(replace(name, '_', ' ')) as varchar2(20))
-                                              as ontology
-                                     from sres.OntologyTerm
-                                     where source_id
-                                           in ('GO_0008150','GO_0003674','GO_0005575'))
-                            select gf.source_id as gene_source_id,
-                                   t.source_id as transcript_source_id,
-                                   cast (gt.source_id as varchar2(20)) as go_id,
-                                   rt.ontology,
-                                   cast(gt.name as varchar2(250)) as go_term_name,
-                                   cast(gail.name as varchar2(24)) as source,
-                                   cast(gec.name as varchar2(12)) as evidence_code,
-                                   cast(gaiec.reference as varchar2(250)) as reference,
-                                   cast(gaiec.evidence_code_parameter as varchar2(80))
-                                     as evidence_code_parameter
-                            from dots.GeneFeature gf, dots.Transcript t,
-                                 dots.TranslatedAaFeature taf, dots.GoAssociation ga,
-                                 sres.OntologyTerm gt, dots.GoAssociationInstance gai,
-                                 dots.GoAssociationInstanceLoe gail,
-                                 dots.GoAssocInstEvidCode gaiec, sres.OntologyTerm gec,
-                                 root_term rt, dots.NaSequence ns
-                            where t.parent_id = gf.na_feature_id
-                              and gf.na_sequence_id = ns.na_sequence_id
-                              and t.na_feature_id = taf.na_feature_id
-                              and taf.aa_sequence_id = ga.row_id
-                              and ga.table_id = (select table_id
-                                                 from core.TableInfo
-                                                 where name = 'TranslatedAASequence')
-                              and ga.go_term_id = gt.ontology_term_id
-                              and ga.go_association_id = gai.go_association_id
-                              and gai.go_assoc_inst_loe_id = gail.go_assoc_inst_loe_id
-                              and gai.go_association_instance_id
-                                  = gaiec.go_association_instance_id
-                              and gaiec.go_evidence_code_id = gec.ontology_term_id
-                              and gt.ancestor_term_id = rt.ontology_term_id(+)
-                           ) ggt
-                     )
-                group by source_id, go_id, ontology,
-                         source, evidence_code, reference, evidence_code_parameter
-               )
+          SELECT source_id, go_id, go_term_name, reference
+          FROM webready.GeneGoTable_p
+          where org_abbrev IN (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -289,8 +232,14 @@
       <column name="ortho_name"/>
       <sql>
         <![CDATA[
-          select distinct source_id, ortho_product, ortho_name
-          from apidbTuning.OrthologousTranscripts
+select ga.source_id, gog2.gene_id as ortho_name, ga2.product as ortho_product
+from webready.geneattributes_p ga
+join webready.geneorthologgroup gog1 on ga.source_id = gog1.gene_id
+join webready.geneorthologgroup gog2 on gog1.group_id = gog2.group_id
+join apidbtuning.geneattributes ga2 on gog2.gene_id = ga2.source_id
+where ga.org_abbrev in (%%PARTITION_KEYS%%)
+and (ga2.project_id = '@PROJECT_ID@' or 'UniDB' = '@PROJECT_ID')
+and ga.source_id != gog2.gene_id
         ]]>
       </sql>
     </sqlQuery>
@@ -310,7 +259,8 @@
                       , ir.interpro_secondary_id
                       , ir.interpro_desc
                       , ir.interpro_family_id
-                 from ApidbTuning.interproresults ir
+                 from Webready.interproresults_p ir
+                 where ir.org_abbrev IN (%%PARTITION_KEYS%%)
                  group by ir.gene_source_id
                         , ir.interpro_db_name
                         , ir.interpro_primary_id
@@ -344,17 +294,18 @@
                    else 'alternate ID'
                  end as id_type,
                  gi.gene AS source_id
-          from apidbTuning.GeneId gi
+          from webready.GeneId_p gi
           where regexp_like(gi.id, '(\D)')
             and gi.database_name not like '%gene2Uniprot_RSRC'
+            and gi.org_abbrev IN (%%PARTITION_KEYS%%)
             -- and gi.union_member != 'same ID' 
          )
      select * from alias_query
      union
-     select regexp_replace(alias, '(*)\.\d\d?$', '') as alias,
+     select regexp_replace(alias, '\(.*\)\.\d\d?$', '') as alias,
             database_name,'base name ' || id_type as id_type,source_id
      from alias_query
-     where regexp_like(alias,'(*)\.\d\d?$')
+     where regexp_like(alias,'\(.*\)\.\d\d?$')
         ]]>
       </sql>
     </sqlQuery>
@@ -369,9 +320,10 @@
           from dots.NaFeatureComment nfc,
                (select nfc.na_feature_comment_id,
                        ta.gene_source_id as source_id
-                from dots.NaFeatureComment nfc, apidbTuning.TranscriptAttributes ta
-                where ta.na_feature_id = nfc.na_feature_id
-                   or ta.gene_na_feature_id = nfc.na_feature_id
+                from dots.NaFeatureComment nfc, webready.TranscriptAttributes_p ta
+                where (ta.na_feature_id = nfc.na_feature_id
+                   or ta.gene_na_feature_id = nfc.na_feature_id)
+                  and ta.org_abbrev IN (%%PARTITION_KEYS%%)
                 group by nfc.na_feature_comment_id, ta.gene_source_id
                ) ci
           where ci.na_feature_comment_id = nfc.na_feature_comment_id
@@ -391,7 +343,8 @@
         <![CDATA[
             select gene_source_id AS source_id, pathway_source,
                    pathway_source_id, pathway_name
-            from apidbTuning.PathwaysGeneTable
+            from webready.PathwaysGeneTable_p
+            where org_abbrev IN (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -406,10 +359,18 @@
       <column name="name"/>
       <sql>
         <![CDATA[
-          select es.iedb_id, to_char(es.sequence) AS sequence, es.name,
-                 ta.source_id as transcript_id, ta.gene_source_id as source_id
-          from apidbTuning.EpitopeSummary es, apidbTuning.TranscriptAttributes ta
-          where es.source_id = ta.source_id
+          SELECT DISTINCT ae.iedb_id
+	  , ta.source_id as transcript_id
+	  , ta.gene_source_id as source_id
+	  , mt.sequence
+	  , ta.organism as name
+          FROM    dots.motifaasequence mt
+           	      , webready.aasequenceepitope_p ae 
+		      , webready.TranscriptAttributes_p ta
+          WHERE   ae.iedb_id = mt.source_id::integer and
+		      ae.aa_sequence_id = ta.aa_sequence_id
+            AND ta.org_abbrev IN (%%PARTITION_KEYS%%)
+            AND ae.org_abbrev IN (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -420,7 +381,8 @@
       <sql>
       <![CDATA[
           select source_id, product
-          from apidbTuning.AllGeneProducts
+          from apidbTuning.AllGeneProducts_p
+	  where org_abbrev IN (%%PARTITION_KEYS%%)
       ]]>
       </sql>
     </sqlQuery>
@@ -434,9 +396,9 @@
         <![CDATA[
             select edd.dataset_presenter_display_name AS dataset, ga.source_id,
                    db.primary_identifier AS ext_id
-            from sres.DbRef db, dots.DbRefNaFeature dbna,
+            from sres.DbRef db, webready.DbRefNaFeature_p dbna,
                  apidbTuning.ExternalDbDatasetPresenter edd,
-                 apidbTuning.GeneAttributes ga
+                 webready.GeneAttributes_p ga
             where db.external_database_release_id = edd.external_database_release_id
               and dbna.db_ref_id = db.db_ref_id
               and ga.na_feature_id = dbna.na_feature_id
@@ -444,13 +406,15 @@
               and lower(edd.dataset_presenter_name) not like '%nafeature_aliases%'
               and edd.dataset_presenter_name not like '%dbxref_simple_gene2HagaiPathway%'
               and lower(edd.dataset_presenter_name) not like '%pubmed%'
+              and dbna.org_abbrev IN (%%PARTITION_KEYS%%)
+              and ga.org_abbrev IN (%%PARTITION_KEYS%%)
           union
             select edd.dataset_presenter_display_name AS dataset,
                    ta.gene_source_id as source_id,
                    db.primary_identifier AS ext_id
-            from sres.DbRef db, dots.DbRefNaFeature dbna,
+            from sres.DbRef db, webready.DbRefNaFeature_p dbna,
                  apidbTuning.ExternalDbDatasetPresenter edd,
-                 apidbTuning.TranscriptAttributes ta
+                 webready.TranscriptAttributes_p ta
             where db.external_database_release_id = edd.external_database_release_id
               and dbna.db_ref_id = db.db_ref_id
               and ta.na_feature_id = dbna.na_feature_id
@@ -458,37 +422,47 @@
               and lower(edd.dataset_presenter_name) not like '%nafeature_aliases%'
               and edd.dataset_presenter_name not like '%dbxref_simple_gene2HagaiPathway%'
               and lower(edd.dataset_presenter_name) not like '%pubmed%'
+              and dbna.org_abbrev IN (%%PARTITION_KEYS%%)
+              and ta.org_abbrev IN (%%PARTITION_KEYS%%)
           union
-              select replace(substr(ed.name, instr(ed.name, '_', 1, 3)+1), '_geneMapping_RSRC', '') as dataset,
+              -- aaegLVP_AGWG_dbxref_GPL8972-Agilent_geneMapping_RSRC
+              select regexp_replace(replace(replace(replace(ed.name, '_geneMapping_RSRC', ''),
+                                                             '-Agilent', ''),
+                                                     '_GenePix', ''),
+                                             '^.*_dbxref_', '') as dataset,
                      ga.source_id, sref.primary_identifier as ext_id
-	      from sres.DbRef sref, dots.DbRefNaFeature refea, sres.ExternalDatabase ed,
-                   sres.ExternalDatabaseRelease edr, apidbTuning.GeneAttributes ga
+	      from sres.DbRef sref, webready.DbRefNaFeature_p refea, sres.ExternalDatabase ed,
+                   sres.ExternalDatabaseRelease edr, webready.GeneAttributes_p ga
 	      WHERE sref.external_database_release_id  = edr.external_database_release_id
 	      AND ed.external_database_id = edr.external_database_id
 	      AND ed.name like '%geneMapping%'
 	      AND refea.db_ref_id = sref.db_ref_id
 	      AND refea.na_feature_id = ga.na_feature_id
+	      AND refea.org_abbrev IN (%%PARTITION_KEYS%%)
+	      AND ga.org_abbrev IN (%%PARTITION_KEYS%%)
           union
               select d.name as dataset, ga.source_id, dbr.primary_identifier as ext_id
               from sres.dbref dbr, dots.DbRefNaFeature dbrf,
                    sres.ExternalDatabaseRelease r, sres.ExternalDatabase d,
-                   apidbTuning.GeneAttributes ga
+                   webready.GeneAttributes_p ga
               where dbr.external_database_release_id = r.external_database_release_id
                 and r.external_database_id = d.external_database_id
                 and dbr.db_ref_id = dbrf.db_ref_id
                 and dbrf.na_feature_id = ga.na_feature_id
                 and d.name not in ('PUBMED')
+                and ga.org_abbrev IN (%%PARTITION_KEYS%%)
           union
               select d.name as dataset, ga.source_id, dbr.primary_identifier as ext_id
               from sres.dbref dbr, dots.DbRefNaFeature dbrf, dots.Transcript t,
                    sres.ExternalDatabaseRelease r, sres.ExternalDatabase d,
-                   apidbTuning.geneAttributes ga
+                   webready.geneAttributes_p ga
               where dbr.external_database_release_id = r.external_database_release_id
                 and r.external_database_id = d.external_database_id
                 and dbr.db_ref_id = dbrf.db_ref_id
                 and dbrf.na_feature_id = t.na_feature_id
                 and t.parent_id = ga.na_feature_id
                 and d.name != 'PUBMED'
+                and ga.org_abbrev IN (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -505,8 +479,10 @@
                 pdb_chain, pdb_id, taxon, pdb_title
           from (select distinct ps.pdb_chain, ps.pdb_title, ps.pdb_id, ps.taxon,
                                 ta.source_id, ta.gene_source_id
-                from apidbTuning.PdbSimilarity ps, apidbTuning.TranscriptAttributes ta
-                where ps.source_id = ta.source_id)
+                from webready.PdbSimilarity_p ps, webready.TranscriptAttributes_p ta
+                where ps.source_id = ta.source_id
+                  and ta.org_abbrev IN (%%PARTITION_KEYS%%)
+                  and ps.org_abbrev IN (%%PARTITION_KEYS%%))
           group by gene_source_id, pdb_chain, pdb_id, taxon, pdb_title
         ]]>
       </sql>
@@ -522,7 +498,8 @@
         <![CDATA[
           select distinct gene_source_id as source_id,  'PMID:' || pubmed_id as pubmed_id, doi, title,
                           authors
-          from apidbTuning.GenePubmed
+          from apidbTuning.GenePubmed_p
+	  WHERE org_abbrev IN (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -584,19 +561,19 @@
                   ols.name as cycle_stage, phenotype_post_composition,
                   phenotype_comment, pr.chebi_annotation_extension
         from dots.GeneFeature gf, apidb.PhenotypeModel pm,
-             apidb.PhenotypeResult pr, sres.OntologyTerm oen,
-             sres.OntologyTerm opq, sres.OntologyTerm ols,
              (  select phenotype_model_id, na_feature_id
                 from apidb.PhenotypeModel
               union
                 select phenotype_model_id, na_feature_id
-                from apidb.NaFeaturePhenotypeModel) pmodel_feature
-	      where gf.na_feature_id = pmodel_feature.na_feature_id
+                from apidb.NaFeaturePhenotypeModel
+             ) pmodel_feature,
+             apidb.PhenotypeResult pr
+        left join sres.OntologyTerm oen on pr.phenotype_entity_term_id = oen.ontology_term_id 
+        left join sres.OntologyTerm opq on pr.phenotype_quality_term_id = opq.ontology_term_id
+        left join sres.OntologyTerm ols on pr.life_cycle_stage_term_id = ols.ontology_term_id
+        where gf.na_feature_id = pmodel_feature.na_feature_id
         and pm.phenotype_model_id = pmodel_feature.phenotype_model_id
         and pm.phenotype_model_id = pr.phenotype_model_id
-        and pr.phenotype_entity_term_id = oen.ontology_term_id (+)
-        and pr.phenotype_quality_term_id = opq.ontology_term_id (+)
-        and pr.life_cycle_stage_term_id = ols.ontology_term_id (+)
        ]]>
       </sql>
     </sqlQuery>
@@ -627,9 +604,11 @@
       <sql>
         <![CDATA[
         select ta.gene_source_id as source_id, gmc.string_value as characteristic_value
-        from apidbTuning.GeneModelCharMD gmc, apidbTuning.TranscriptAttributes ta
+        from webready.GeneModelCharacteristics_p gmc, webready.TranscriptAttributes_p ta
         where gmc.source_id = ta.source_id
           and string_value not in ('No', 'NA')
+          and gmc.org_abbrev IN (%%PARTITION_KEYS%%)
+          and ta.org_abbrev IN (%%PARTITION_KEYS%%)
        ]]>
       </sql>
     </sqlQuery>
diff --git a/Model/lib/wdk/ApiCommon/organismQueries.xml b/Model/lib/wdk/ApiCommon/organismQueries.xml
index fff8bd3..9d2499a 100644
--- a/Model/lib/wdk/ApiCommon/organismQueries.xml
+++ b/Model/lib/wdk/ApiCommon/organismQueries.xml
@@ -39,19 +39,17 @@
         <![CDATA[
                  select oa.source_id, oa.species, oa.organism_name AS organism_full,
                         oa. organism_name AS organism, oa.organism_name AS hyperlinkName,
-                        decode(genome_source, 'gb', 'GenBank',
-                               'jkissinger', 'Kissinger Lab', genome_source)
+                        CASE genome_source WHEN 'gb' THEN 'GenBank' WHEN 'jkissinger' THEN 'Kissinger Lab' ELSE genome_source END
                           as data_source,
                         genome_dataset.genome_dataset_id
-                 from apidbTuning.OrganismAttributes oa,
-                      (select oa.source_id, dsp.description,
+                 from apidbTuning.OrganismAttributes oa
+                 left join (select oa.source_id, dsp.description,
                               dsp.dataset_presenter_id as genome_dataset_id
                        from apidbTuning.DatasetPresenter dsp, apidbTuning.Datasetdatasource dd,
                             apidbTuning.OrganismAttributes oa
-                       where dsp.type = 'genome'
+                       where dd.category = 'Genomes'
                          and dsp.dataset_presenter_id = dd.dataset_presenter_id
-                         and oa.component_taxon_id = dd.taxon_id) genome_dataset
-                 where genome_dataset.source_id = oa.source_id(+)
+                         and oa.component_taxon_id = dd.taxon_id) genome_dataset on genome_dataset.source_id = oa.source_id
         ]]>
       </sql>
     </sqlQuery>
@@ -79,7 +77,7 @@
           select oa.source_id, dsp.description
           from apidbTuning.DatasetPresenter dsp, apidbTuning.Datasetdatasource dd,
                apidbTuning.OrganismAttributes oa
-          where dsp.type = 'genome'
+          where dd.category = 'Genomes'
             and dsp.dataset_presenter_id = dd.dataset_presenter_id
             and oa.component_taxon_id = dd.taxon_id
         ]]>
@@ -93,9 +91,9 @@
         <![CDATA[
           select distinct oa.source_id, dsh.genome_version
           from apidbTuning.DatasetPresenter dsp, apidbTuning.DatasetHistory dsh,
-               apidbTuning.Datasetsource dd,
+               apidbTuning.DatasetDatasource dd,
                apidbTuning.OrganismAttributes oa
-          where dsp.type = 'genome'
+          where dd.category = 'Genomes'
             and dsp.dataset_presenter_id = dd.dataset_presenter_id
             and dsh.dataset_presenter_id = dd.dataset_presenter_id
             and oa.component_taxon_id = dd.taxon_id
diff --git a/Model/lib/wdk/ApiCommon/pathwayQueries.xml b/Model/lib/wdk/ApiCommon/pathwayQueries.xml
index 0f933c3..a5792f0 100644
--- a/Model/lib/wdk/ApiCommon/pathwayQueries.xml
+++ b/Model/lib/wdk/ApiCommon/pathwayQueries.xml
@@ -8,7 +8,7 @@
       <sql>
         <![CDATA[
           select source_id, pathway_source
-          from apidbTuning.PathwayAttributes
+          from webready.PathwayAttributes
         ]]>
       </sql>
     </sqlQuery>
@@ -26,7 +26,7 @@
           select source_id, pathway_source,
                  source_id as old_source_id,
                  pathway_source as old_pathway_source
-          from apidbTuning.PathwayAttributes
+          from webready.PathwayAttributes
         ]]>
       </sql>
     </sqlQuery>
@@ -39,7 +39,7 @@
       <sql>
         <![CDATA[
           select pa.source_id, pa.pathway_source, pa.name, '@PROJECT_ID@' as project
-          from apidbTuning.PathwayAttributes pa
+          from webready.PathwayAttributes pa
         ]]>
       </sql>
     </sqlQuery>
@@ -64,16 +64,16 @@
                           pr.substrates_text, pr.products_text,
                           pc.compound_source_id, pc.chebi_accession,
                           cid.id as compound_other_id
-          from apidbTuning.PathwayAttributes pa, apidbTuning.PathwayCompounds pc,
-               apidbTuning.PathwayReactions pr,
+          from webready.PathwayAttributes pa, webready.PathwayReactions pr,
+               webready.PathwayCompounds pc
+	  left join
                (select compound, id
-                from apidbTuning.CompoundId
+                from webready.CompoundId
                 where compound != id
-               ) cid
+               ) cid on pc.compound_source_id = cid.compound
           where pc.pathway_id = pa.pathway_id
             and pr.reaction_id = pc.reaction_id
             and pr.ext_db_name = pc.ext_db_name
-            and pc.compound_source_id = cid.compound(+)
         ]]>
       </sql>
     </sqlQuery>
diff --git a/Model/lib/wdk/ApiCommon/sequenceQueries.xml b/Model/lib/wdk/ApiCommon/sequenceQueries.xml
index ed35a06..c540845 100644
--- a/Model/lib/wdk/ApiCommon/sequenceQueries.xml
+++ b/Model/lib/wdk/ApiCommon/sequenceQueries.xml
@@ -7,10 +7,9 @@
       <column name="source_id"/>
       <sql>
         <![CDATA[
-          select distinct sa.source_id
-          from apidbTuning.GenomicSeqAttributes sa, apidb.Organism o
-          where sa.taxon_id = o.taxon_id
-            and o.abbrev = $$organismAbbrev$$
+          select distinct source_id
+          from webready.GenomicSeqAttributes_p
+            where org_abbrev = $$organismAbbrev$$
         ]]>
       </sql>
     </sqlQuery>
@@ -41,13 +40,25 @@
   </paramSet>
 
   <querySet name="SequenceAttributes" queryType="attribute" isCacheable="false">
+    <!-- Used by WDK to replace %%PARTITION_KEYS%% macro with the keys for a result set -->
+    <sqlQuery name="PartitionKeys">
+      <column name="source_id"/>
+      <column name="partition_id"/>
+      <sql>
+        <![CDATA[
+         select source_id, org_abbrev as partition_key from apidbtuning.GenomicSeqOrgAbbrev
+        ]]>
+      </sql>  
+    </sqlQuery>
+
     <sqlQuery name="SequenceAlias">
       <column name="source_id"/>
       <column name="old_source_id"/>
       <sql>
         <![CDATA[
           select distinct sequence as source_id, id as old_source_id
-          from apidbTuning.GenomicSequenceId
+          from webready.GenomicSequenceId_p
+          where org_abbrev in (%%PARTITION_KEYS%%)
         ]]>
       </sql>
 
@@ -71,7 +82,8 @@
                    else organism
                  end as description,
                  replace(sequence_type, '_', ' ') as sequence_type
-          from apidbTuning.GenomicSeqAttributes
+          from webready.GenomicSeqAttributes_p
+          where org_abbrev in (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -86,7 +98,8 @@
       <sql>
         <![CDATA[
           select source_id, organism
-          from apidbTuning.GenomicSeqAttributes
+          from webready.GenomicSeqAttributes_p
+          where org_abbrev in (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -98,7 +111,8 @@
       <sql>
         <![CDATA[
           select si.sequence as source_id, si.id as seq_id
-          from apidbTuning.GenomicSequenceId si
+          from webready.GenomicSequenceId_p si
+          where org_abbrev in (%%PARTITION_KEYS%%)
         ]]>
       </sql>
     </sqlQuery>
@@ -109,13 +123,12 @@
       <column name="comment_id"/>
       <sql>
         <![CDATA[
-          select tsc.source_id, tsc.comment_id
-          from apidb.TextSearchableComment@COMMENT_DBLINK@ tsc,
-               @COMMENT_SCHEMA@MappedComment@COMMENT_DBLINK@ mc
-          where mc.comment_id = tsc.comment_id
-            and tsc.comment_target_type = 'genome'
+          select c.stable_id as source_id, c.comment_id
+          from @REMOTE_COMMENT_SCHEMA@MappedComment mc, @REMOTE_COMMENT_SCHEMA@comments c
+          where mc.comment_id = c.comment_id
+            and c.comment_target_id = 'genome'
             and mc.review_status_id != 'rejected'
-            and mc.is_visible = 1
+            and mc.is_visible = true
         ]]>
       </sql>
     </sqlQuery>
@@ -125,13 +138,21 @@
       <column name="comment_content"/>
       <sql>
         <![CDATA[
-          select tsc.source_id, tsc.content
-          from apidb.TextSearchableComment@COMMENT_DBLINK@ tsc,
-               @COMMENT_SCHEMA@MappedComment@COMMENT_DBLINK@ mc
+          select tsc.stable_id as source_id, tsc.cntnt
+          from @REMOTE_COMMENT_SCHEMA@MappedComment mc,
+	  (select stable_id, comment_target_id, c.comment_id,
+	   concat(headline, '|', content, '|', first_name, ' ', last_name, '(', organization, ')', authors) as cntnt
+	   from @REMOTE_COMMENT_SCHEMA@comments c
+	   left join @REMOTE_COMMENT_SCHEMA@comment_users u on  c.user_id = u.user_id
+	   left join (select comment_id, string_agg(source_id, ', ' order by source_id) as authors
+                      from @REMOTE_COMMENT_SCHEMA@CommentReference
+                      where database_name = 'author'
+		      group by comment_id) a on a.comment_id = c.comment_id
+	  ) tsc
           where mc.comment_id = tsc.comment_id
-            and tsc.comment_target_type = 'genome'
+            and tsc.comment_target_id = 'genome'
             and mc.review_status_id != 'rejected'
-            and mc.is_visible = 1
+            and mc.is_visible = true
         ]]>
       </sql>
     </sqlQuery>
diff --git a/Model/lib/wdk/ApiCommon/siteSearchModel.xml b/Model/lib/wdk/ApiCommon/siteSearchModel.xml
index 457e0bc..0d3ee75 100644
--- a/Model/lib/wdk/ApiCommon/siteSearchModel.xml
+++ b/Model/lib/wdk/ApiCommon/siteSearchModel.xml
@@ -30,8 +30,6 @@
 
   <import file="ApiCommon/sequenceQueries.xml"/>
 
-  <import file="ApiCommon/popsetQueries.xml"/>
-
   <import file="ApiCommon/apolloTrackQueries.xml"/>
 
 </wdkModel>
diff --git a/Model/lib/wdk/ApiCommon/siteSearchRecords.xml b/Model/lib/wdk/ApiCommon/siteSearchRecords.xml
index 48a9c41..1c1c28a 100644
--- a/Model/lib/wdk/ApiCommon/siteSearchRecords.xml
+++ b/Model/lib/wdk/ApiCommon/siteSearchRecords.xml
@@ -37,11 +37,6 @@
               recordClassRef="recordClasses.sequence">
     </question>
 
-    <question name="PopsetIsolates" displayName="dontcare"
-              queryRef="PopsetIds.AllPopsetIsolates"
-              recordClassRef="recordClasses.PopsetRecordClass">
-    </question>
-
   </questionSet>
 
   <recordClassSet name="recordClasses">
@@ -106,7 +101,7 @@
     <!-- ########################  Sequence Record  ######################## -->
     <!-- ################################################################### -->
 
-    <recordClass name="sequence" urlName="genomic-sequence" displayName="Genomic sequence">
+    <recordClass name="sequence" urlName="genomic-sequence" displayName="Genomic sequence" partitionKeysQueryRef="SequenceAttributes.PartitionKeys">
       <propertyList name="batch">
         <value>organism</value>
       </propertyList>
@@ -383,7 +378,7 @@
     <!-- ##########################  Gene Record  ########################## -->
     <!-- ################################################################### -->
 
-    <recordClass name="gene" urlName="gene">
+    <recordClass name="gene" urlName="gene" partitionKeysQueryRef="GeneAttributes.PartitionKeys">
 
       <propertyList name="batch">
         <value>organism</value>
@@ -634,93 +629,12 @@
         <columnAttribute name="image_type"/>
       </table>
 
-      <table name="GeneModelCharacteristics"
+<!--      <table name="GeneModelCharacteristics"
              displayName="GeneModel Characteristics"
              queryRef="GeneTables.GeneModelCharacteristics">
         <columnAttribute name="characteristic_value"/>
       </table>
-
-    </recordClass>
-
-
-    <!-- ################################################################### -->
-    <!-- #########################  Popset Record  ######################### -->
-    <!-- ################################################################### -->
-
-    <recordClass name="PopsetRecordClass" urlName="popsetSequence" displayName="Popset isolate sequence">
-      <propertyList name="batch">
-        <value>popset-isolate</value>
-      </propertyList>
-
-      <primaryKey aliasQueryRef="PopsetAttributes.PopsetAlias">
-        <columnRef>source_id</columnRef>
-      </primaryKey>
-
-      <idAttribute name="primary_key" displayName="Popset ID">
-        <propertyList name="boost">
-          <value>100</value>
-        </propertyList>
-        <text>
-          <![CDATA[
-                   $$source_id$$
-          ]]>
-        </text>
-      </idAttribute>
-
-      <reporter name="solrjson"
-                displayName="solr json: choose from columns and/or tables"
-                scopes=""
-                implementation="org.eupathdb.sitesearch.data.model.report.SolrLoaderReporter"/>
-
-      <attributeQueryRef ref="PopsetAttributes.Attributes">
-        <columnAttribute name="project" displayName="dontcare" internal="true"/>  <!-- special field for project filtering -->
-        <columnAttribute name="organism" displayName="Organism" />
-        <columnAttribute name="description" displayName="Description">
-          <propertyList name="isSummary">
-            <value>true</value>
-          </propertyList>
-        </columnAttribute>
-        <columnAttribute name="isolation_source" displayName="Isolation source"/>
-        <columnAttribute name="curated_isolation_source" displayName="Curated isolation source"/>
-        <columnAttribute name="note" displayName="Note"/>
-        <columnAttribute name="product" displayName="Product">
-          <propertyList name="isSummary">
-            <value>true</value>
-          </propertyList>
-          <propertyList name="boost">
-            <value>1.5</value>
-          </propertyList>
-        </columnAttribute>
-        <columnAttribute name="geographic_location" displayName="Geographic location">
-          <propertyList name="isSummary">
-            <value>true</value>
-          </propertyList>
-          <propertyList name="boost">
-            <value>1.5</value>
-          </propertyList>
-        </columnAttribute>
-        <columnAttribute name="curated_geographic_location" displayName="Curated geographic location"/>
-        <columnAttribute name="specific_host" displayName="Host"/>
-        <columnAttribute name="popset" displayName="Popset"/>
-        <columnAttribute name="strain" displayName="Strain"/>
-      </attributeQueryRef>
-
-      <table name="References"  displayName="References" queryRef="PopsetTables.References">
-        <columnAttribute name="title"/>
-        <columnAttribute name="authors"/>
-        <columnAttribute name="journal"/>
-      </table>
-
-    <!--  THIS QUERY IS TOO SLOW  - 10 minutes in plasmo  - not worth it
-      <table name="GeneOverlap" 
-             displayName="Blast Similarity Alignments and Overlapping Genes" queryRef="PopsetTables.GeneOverlap">
-        <columnAttribute name="source_id"/>
-        <columnAttribute name="gene"/>
-        <columnAttribute name="organism"/>
-        <columnAttribute name="gene_product"/>
-      </table>
 -->
-
     </recordClass>
 
   </recordClassSet>
diff --git a/Model/lib/wdk/OrthoMCL/groupRecordQueries.xml b/Model/lib/wdk/OrthoMCL/groupRecordQueries.xml
index 5e19a5c..ab075b3 100644
--- a/Model/lib/wdk/OrthoMCL/groupRecordQueries.xml
+++ b/Model/lib/wdk/OrthoMCL/groupRecordQueries.xml
@@ -83,7 +83,7 @@
 	  <sql>
             <![CDATA[
               select group_name,
-                     listagg(ec_number, ', ') within group (order by ec_number) as ec_numbers
+                     string_agg(ec_number, ', ' order by ec_number) as ec_numbers
               from (select distinct sa.group_name, ec.ec_number
                     from sres.EnzymeClass ec, dots.AaSequenceEnzymeClass asec, apidbTuning.SequenceAttributes sa
                     where ec.enzyme_class_id = asec.enzyme_class_id
@@ -99,13 +99,13 @@
 	  <sql>
             <![CDATA[
               select og.group_id as group_name, verbiage.keywords
-              from apidb.OrthologGroup og,
-                   (select ortholog_group_id,
-                           listagg(keyword, '; ') within group (order by to_number(frequency) desc) as keywords
+              from apidb.OrthologGroup og
+              left join (select ortholog_group_id,
+                           string_agg(keyword, '; ' order by frequency::numeric desc) as keywords
                     from apidb.OrthomclGroupKeyword
                     group by ortholog_group_id
                    ) verbiage
-              where og.group_id = verbiage.ortholog_group_id(+)
+              on og.group_id = verbiage.ortholog_group_id
             ]]>
 	  </sql>
 	</sqlQuery>
@@ -116,13 +116,13 @@
 	  <sql>
             <![CDATA[
               select og.group_id as group_name, domains.descriptions
-              from apidb.OrthologGroup og,
-                   (select ortholog_group_id,
-                           listagg(description, '; ') within group (order by frequency desc) as descriptions
+              from apidb.OrthologGroup og
+              left join (select ortholog_group_id,
+                           string_agg(description, '; ' order by frequency desc) as descriptions
                     from apidb.OrthomclGroupDomain
                     group by ortholog_group_id
                    ) domains
-              where og.ortholog_group_id = domains.ortholog_group_id(+)
+              on og.ortholog_group_id = domains.ortholog_group_id
             ]]>
 	  </sql>
 	</sqlQuery>
diff --git a/Model/lib/wdk/OrthoMCL/sequenceRecordQueries.xml b/Model/lib/wdk/OrthoMCL/sequenceRecordQueries.xml
index e855f65..5cc7538 100644
--- a/Model/lib/wdk/OrthoMCL/sequenceRecordQueries.xml
+++ b/Model/lib/wdk/OrthoMCL/sequenceRecordQueries.xml
@@ -214,7 +214,7 @@ from apidbTuning.SequenceAttributes
                          ot.three_letter_abbrev AS abbreviation,
                          ot.name AS taxon
                   FROM dots.ExternalAaSequence eas, apidb.orthomcltaxon ot
-                  WHERE NVL(SUBSTR(eas.secondary_identifier, 0, INSTR(eas.secondary_identifier, '|')-1), eas.secondary_identifier) = ot.three_letter_abbrev
+                  WHERE COALESCE(SUBSTRING(eas.secondary_identifier, 1, POSITION('|' IN eas.secondary_identifier)-1), eas.secondary_identifier) = ot.three_letter_abbrev
  		]]>
             </sql>
         </sqlQuery>
diff --git a/Model/lib/wdk/Shared/datasetQueries.xml b/Model/lib/wdk/Shared/datasetQueries.xml
index 1946ca1..bdbaec0 100644
--- a/Model/lib/wdk/Shared/datasetQueries.xml
+++ b/Model/lib/wdk/Shared/datasetQueries.xml
@@ -5,12 +5,13 @@
       <column name="dataset_id"/>
       <sql>
         <![CDATA[
-          select dataset_presenter_id as dataset_id
-          from apidbTuning.DatasetPresenter
+          select distinct dp.dataset_presenter_id as dataset_id
+          from apidbTuning.DatasetPresenter dp, apidbtuning.datasetdatasource dd
           where (category is null OR category != 'Link outs')
+            and dp.dataset_presenter_id = dd.dataset_presenter_id
             and (project_id = '@PROJECT_ID@'
-                 or '@PROJECT_ID@' = 'VEuPathDB')
-            and dataset_presenter_id
+                 or '@PROJECT_ID@' = 'UniDB')
+            and dp.dataset_presenter_id
                 not in (select dataset_presenter_id
                         from apidbTuning.DatasetProperty
                         where property = 'isPublic' and value = 'false')
@@ -31,14 +32,19 @@
       <column name="newcategory"/>
       <sql>
         <![CDATA[
-          select dataset_presenter_id as dataset_id, '@PROJECT_ID@' as project,
+         select dp.dataset_presenter_id as
+                 dataset_id, '@PROJECT_ID@' as project,
                  display_name, display_name as hyperlinkName, description, summary, acknowledgement,
-                 nvl(display_category, category) as newcategory
-          from apidbTuning.DatasetPresenter
-          where (category is null OR category != 'Link outs')
-            and (project_id = '@PROJECT_ID@'
-                 or '@PROJECT_ID@' = 'VEuPathDB')
-            and dataset_presenter_id
+                 newcategory
+          from apidbTuning.DatasetPresenter dp,
+	    (select dataset_presenter_id, string_agg(category, ', ') as newcategory
+             from apidbtuning.datasetdatasource dd
+             where (category is null OR category != 'Link outs')
+             and (project_id = '@PROJECT_ID@'
+             or 'UniDB' = '@PROJECT_ID@')   
+	     group by dataset_presenter_id) cat
+	   where dp.dataset_presenter_id = cat.dataset_presenter_id
+            and dp.dataset_presenter_id
                 not in (select dataset_presenter_id
                         from apidbTuning.DatasetProperty
                         where property = 'isPublic' and value = 'false')
@@ -61,9 +67,9 @@
           from apidbTuning.DatasetContact
           where dataset_presenter_id
                 in (select dataset_presenter_id
-                    from apidbTuning.DatasetPresenter
+                    from apidbTuning.DatasetDatasource
                     where project_id = '@PROJECT_ID@'
-                       or '@PROJECT_ID@' = 'VEuPathDB')
+                       or '@PROJECT_ID@' = 'UniDB')
             and dataset_presenter_id
                 not in (select dataset_presenter_id
                         from apidbTuning.DatasetProperty
@@ -83,9 +89,9 @@
           where pmid is not null
             and dataset_presenter_id
                 in (select dataset_presenter_id
-                    from apidbTuning.DatasetPresenter
+                    from apidbTuning.DatasetDatasource
                     where project_id = '@PROJECT_ID@'
-                       or '@PROJECT_ID@' = 'VEuPathDB')
+                       or '@PROJECT_ID@' = 'UniDB')
             and dataset_presenter_id
                 not in (select dataset_presenter_id
                         from apidbTuning.DatasetProperty
@@ -105,9 +111,9 @@
             and tn.name_class = 'scientific name'
             and dataset_presenter_id
                 in (select dataset_presenter_id
-                    from apidbTuning.DatasetPresenter
+                    from apidbTuning.DatasetDatasource
                     where project_id = '@PROJECT_ID@'
-                       or '@PROJECT_ID@' = 'VEuPathDB')
+                       or '@PROJECT_ID@' = 'UniDB')
             and dataset_presenter_id
                 not in (select dataset_presenter_id
                         from apidbTuning.DatasetProperty
@@ -171,7 +177,7 @@
                 in (select dataset_presenter_id
                     from apidbTuning.DatasetPresenter
                     where project_id = '@PROJECT_ID@'
-                       or '@PROJECT_ID@' = 'VEuPathDB')
+                       or '@PROJECT_ID@' = 'UniDB')
             and sd.dataset_id
                 not in (select dataset_presenter_id
                         from apidbTuning.DatasetProperty
@@ -253,7 +259,7 @@
                 in (select dataset_presenter_id
                     from apidbTuning.DatasetPresenter
                     where project_id = '@PROJECT_ID@'
-                       or '@PROJECT_ID@' = 'VEuPathDB')
+                       or '@PROJECT_ID@' = 'UniDB')
             and dsp.dataset_presenter_id
                 not in (select dataset_presenter_id
                         from apidbTuning.DatasetProperty
@@ -274,7 +280,7 @@
                 in (select dataset_presenter_id
                     from apidbTuning.DatasetPresenter
                     where project_id = '@PROJECT_ID@'
-                       or '@PROJECT_ID@' = 'VEuPathDB')
+                       or '@PROJECT_ID@' = 'UniDB')
             and dprop.dataset_presenter_id
                 not in (select dataset_presenter_id
                         from apidbTuning.DatasetProperty
@@ -329,7 +335,7 @@
                 in (select dataset_presenter_id
                     from apidbTuning.DatasetPresenter
                     where project_id = '@PROJECT_ID@'
-                       or '@PROJECT_ID@' = 'VEuPathDB')
+                       or '@PROJECT_ID@' = 'UniDB')
             and t3.dataset_presenter_id
                 not in (select dataset_presenter_id
                         from apidbTuning.DatasetProperty
diff --git a/Model/lib/wdk/Shared/datasetRecord.xml b/Model/lib/wdk/Shared/datasetRecord.xml
index fa67cae..d04a218 100644
--- a/Model/lib/wdk/Shared/datasetRecord.xml
+++ b/Model/lib/wdk/Shared/datasetRecord.xml
@@ -120,6 +120,7 @@
 	      
       </table>
 
+<!--
       <table name="AttributeValues" excludeProjects="VEuPathDB"
              displayName="Attribute values"
              queryRef="DatasetTables.AttributeValues">
@@ -194,7 +195,7 @@
         <columnAttribute name="purpose"/>
         <columnAttribute name="dataset_name"/>
       </table>
-
+-->
       <!-- special internal field for organism filtering -->
       <table name="organismsForFilter" displayName="dontcare" queryRef="DatasetTables.Organisms" internal="true">
         <propertyList name="includeProjects">
diff --git a/build.xml b/build.xml
index 70610c3..cac5684 100644
--- a/build.xml
+++ b/build.xml
@@ -12,11 +12,7 @@
   <!-- oooooooooooooooooooooooooo  Installation  oooooooooooooooooooooooooo -->
   <!-- oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo -->
 
-  <target name="SiteSearchData-Installation" depends="WDK-Installation,
-                                                      EbrcWebsiteCommon/Site-Installation,
-                                                      EbrcWebsiteCommon/Model-Installation,
-                                                      EbrcWebsiteCommon/View-Installation,
-                                                      EbrcWebsiteCommon/Watar-Installation,
+  <target name="SiteSearchData-Installation" depends="EbrcWebsiteCommon-Installation,
                                                       SiteSearchData/Model-Installation">
     <ant target="defaultProjectInstall">
       <property name="project" value="SiteSearchData" />