Added support for searching by Genus only