Fix up tennis command so you can search for matches.