Improve auto matchting on show names