Matches are now properly displayed in a Grid