further optimizations, new matches page