Change catalog controller to use new solr suffixes