diff --git a/src/NzbDrone.Core/Indexers/Definitions/AvistaZ.cs b/src/NzbDrone.Core/Indexers/Definitions/AvistaZ.cs
index 97dda7e42..69721505c 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/AvistaZ.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/AvistaZ.cs
@@ -36,11 +36,11 @@ namespace NzbDrone.Core.Indexers.Definitions
             {
                 TvSearchParams = new List<TvSearchParam>
                        {
-                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
+                           TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId, TvSearchParam.TvdbId
                        },
                 MovieSearchParams = new List<MovieSearchParam>
                        {
-                           MovieSearchParam.Q, MovieSearchParam.ImdbId
+                           MovieSearchParam.Q, MovieSearchParam.ImdbId, MovieSearchParam.TmdbId
                        }
             };
 
diff --git a/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazRequestGenerator.cs
index ab8d086b7..424b5def3 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/Avistaz/AvistazRequestGenerator.cs
@@ -77,6 +77,10 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
             {
                 parameters.Add("imdb", searchCriteria.FullImdbId);
             }
+            else if (searchCriteria.TmdbId.HasValue)
+            {
+                parameters.Add("tmdb", searchCriteria.TmdbId.Value.ToString());
+            }
             else
             {
                 parameters.Add("search", GetSearchTerm(searchCriteria.SanitizedSearchTerm).Trim());
@@ -105,6 +109,12 @@ namespace NzbDrone.Core.Indexers.Definitions.Avistaz
             if (searchCriteria.ImdbId.IsNotNullOrWhiteSpace())
             {
                 parameters.Add("imdb", searchCriteria.FullImdbId);
+                parameters.Add("search", GetSearchTerm(searchCriteria.EpisodeSearchString).Trim());
+            }
+            else if (searchCriteria.TvdbId.HasValue)
+            {
+                parameters.Add("tvdb", searchCriteria.TvdbId.Value.ToString());
+                parameters.Add("search", GetSearchTerm(searchCriteria.EpisodeSearchString).Trim());
             }
             else
             {