diff --git a/misc-scripts/xref_mapping/XrefParser/BaseParser.pm b/misc-scripts/xref_mapping/XrefParser/BaseParser.pm
index 7ac183bd4ca9314215e9389e24ceeca74300b18b..fab97c9d9609caefc4ce312374442af8d1887bf5 100644
--- a/misc-scripts/xref_mapping/XrefParser/BaseParser.pm
+++ b/misc-scripts/xref_mapping/XrefParser/BaseParser.pm
@@ -284,7 +284,7 @@ sub get_valid_xrefs_for_dependencies{
   }
   $sth->finish;
 
-  $sql  = "select d.dependent_xref_id, x2.accession ";
+  $sql  = "select d.master_xref_id, x2.accession ";
   $sql .= "  from dependent_xref d, xref x1, xref x2 ";
   $sql .= "    where x1.xref_id = d.master_xref_id and";
   $sql .= "          x1.source_id=? and ";
@@ -311,7 +311,7 @@ sub get_valid_codes{
   my %valid_codes;
   my @sources;
 
-  my $sql = "select source_id from source where name like '%".$source_name."%'";
+  my $sql = "select source_id from source where upper(name) like '%".uc($source_name)."%'";
   my $sth = dbi()->prepare($sql);
   $sth->execute();
   while(my @row = $sth->fetchrow_array()){