Episode Search fixes