add country facet, remove 2 topicClass, reorder