Also fix duplicate result viewers...