Improved show matching