Add support for catalogs that include dashes