Added better search for genomes