diff --git a/src/org/pathvisio/wpclient/panels/XrefSearchPanel.java b/src/org/pathvisio/wpclient/panels/XrefSearchPanel.java
index 58b0023..adfa0fa 100644
--- a/src/org/pathvisio/wpclient/panels/XrefSearchPanel.java
+++ b/src/org/pathvisio/wpclient/panels/XrefSearchPanel.java
@@ -56,7 +56,6 @@
 import org.pathvisio.wikipathways.webservice.WSSearchResult;
 import org.pathvisio.wpclient.WSResult;
 import org.pathvisio.wpclient.WikiPathwaysClientPlugin;
-import org.pathvisio.wpclient.models.ResultTableModel;
 import org.pathvisio.wpclient.models.XrefResultTableModel;
 import org.wikipathways.client.WikiPathwaysClient;
 
@@ -178,7 +177,7 @@ public void mouseClicked(MouseEvent e) {
 
 					try {
 
-						ResultTableModel model = (ResultTableModel) target
+						XrefResultTableModel model = (XrefResultTableModel ) target
 								.getModel();
 						File tmpDir = new File(plugin.getTmpDir(),
 								WikiPathwaysClientPlugin
@@ -229,9 +228,9 @@ protected WSResult[] doInBackground() throws Exception {
 								String p[] = xrefids[i].split(":");
 
 								if (p.length == 2) {
-									DataSource ds = DataSource
-											.getByFullName(p[0]);
+									DataSource ds =DataSource.getBySystemCode(p[0]);
 									pxXref.add(new Xref(p[1], ds));
+									
 
 								} else {
 									JOptionPane.showMessageDialog(
@@ -308,9 +307,9 @@ private Map<WSSearchResult, Integer> CreateIndexList(
 						String string = (String) entry.getKey();
 						for (int k = 0; k < pxXref.size(); k++) {
 							Xref temp = pxXref.get(k);
-							DataSource.getBySystemCode(temp.getDataSource().getFullName());
 							
-							String[] li = client.getXrefList(string,DataSource.getBySystemCode(temp.getDataSource().getFullName()));
+							
+							String[] li = client.getXrefList(string,DataSource.getBySystemCode(temp.getDataSource().getSystemCode()));
 							for (int i = 0; i < li.length; i++) {
 								if (li[i].equalsIgnoreCase(temp.getId())) {
 									count++;