Refactor category labels. Fix results sorting.