better catalog selection; treatment for no catalogs returned from keystone