Bugfixes in matches view