Improve manual classification in viewer.