improved match view to not allow buggy generation