diff --git a/src/Jackett.Common/Definitions/uploadcx.yml b/src/Jackett.Common/Definitions/uploadcx.yml
index 7f4b35c3c..accbae8e9 100644
--- a/src/Jackett.Common/Definitions/uploadcx.yml
+++ b/src/Jackett.Common/Definitions/uploadcx.yml
@@ -1,7 +1,7 @@
 ---
 id: uploadcx
 name: upload.cx
-description: "upload.cx is a Private Torrent Tracker for MOVIES"
+description: "upload.cx is a Private Torrent Tracker for MOVIES / TV"
 language: en-US
 type: private
 encoding: UTF-8
@@ -11,10 +11,11 @@ links:
 caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movies"}
-
+    - {id: 2, cat: TV, desc: "TV"}
   modes:
     search: [q]
-    movie-search: [q, imdbid, tmdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]    
 
 settings:
   - name: apikey
@@ -72,8 +73,11 @@ search:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
     imdbId: "{{ .Query.IMDBIDShort }}"
     tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
     "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
@@ -107,6 +111,8 @@ search:
       selector: imdb_id
     tmdbid:
       selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
     genre:
       selector: meta.genres
       filters:
@@ -116,6 +122,8 @@ search:
           args: ["(?i)(Science Fiction)", "Science_Fiction"]
         - name: re_replace
           args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
     description:
       text: "{{ .Result.genre }}"
     files: