Clean Match Viewer Fixed