diff --git a/channels/tapmovie.py b/channels/tapmovie.py
index 057f63fa..76459651 100644
--- a/channels/tapmovie.py
+++ b/channels/tapmovie.py
@@ -25,21 +25,6 @@ def mainlist(item):
     return locals()
 
 
-def peliculas(item):
-    itemlist = []
-    movie = item.contentType == 'movie'
-    key = 'latest_updated' if movie else 'latest_tvshows'
-    action = 'findvideos' if movie else 'episodios'
-    json = httptools.downloadpage(host + api_url + 'home', post={}).json[key]
-    for i in json:
-        itemlist.append(item.clone(id=i.get('id'), title=i.get('title'), contentTitle=i.get('title'), contentSerieName='' if movie else i.get('title'),
-                                   contentPlot=i.get('description'), thumbnail=i.get('poster'),
-                                    fanart=i.get('backdrop'), year=i.get('year'), action=action,
-                                   url='{}/{}/{}-{}'.format('https://filmigratis.org', item.contentType, i.get('id'), support.scrapertools.slugify(i.get('title')))))
-    support.tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    return itemlist
-
-
 def episodios(item):
     support.info(item)
     itemlist = []
@@ -63,18 +48,21 @@ def episodios(item):
 def genres(item):
     itemlist = []
     for n, genre in enumerate(httptools.downloadpage(host + api_url + 'categories', post={}).json.get('categories', [])):
-        itemlist.append(item.clone(action="search_", genre=genre.get('name'), title=genre.get('value'), n=n))
+        itemlist.append(item.clone(action="peliculas", genre=genre.get('name'), title=genre.get('value'), n=n))
     return support.thumb(itemlist, genre=True)
 
 
-def search_(item, text=''):
+def peliculas(item, text=''):
     support.info('search', item)
     itemlist = []
+    filter_type = False
     if item.genre:
         text = item.genre
         cmd = 'search/category'
     else:
         cmd = 'search'
+        if not text:
+            filter_type = True
 
     try:
         page = int(item.url.split('?p=')[1])
@@ -83,13 +71,15 @@ def search_(item, text=''):
     results = httptools.downloadpage(host + api_url + cmd, post={'search': text, 'page': page}).json.get('results', [])
     for result in results:
         contentType = 'movie' if result['type'] == 'FILM' else 'tvshow'
-        itemlist.append(item.clone(id=result.get('id'), title=result.get('title'), contentTitle=result.get('title'),
-                                   contentSerieName='' if contentType == 'movie' else result.get('title'),
-                                   contentPlot=result.get('description'), thumbnail=result.get('poster'),
-                                   fanart=result.get('backdrop'), year=result.get('year'), action='episodios' if contentType == 'tvshow' else 'findvideos',
-                                   url='{}/{}/{}-{}'.format('https://filmigratis.org', contentType, result.get('id'), support.scrapertools.slugify(result.get('title'))),
-                                   contentType=contentType))
+        if not filter_type or (filter_type and contentType == item.contentType):
+            itemlist.append(item.clone(id=result.get('id'), title=result.get('title'), contentTitle=result.get('title'),
+                                       contentSerieName='' if contentType == 'movie' else result.get('title'),
+                                       contentPlot=result.get('description'), thumbnail=result.get('poster'),
+                                       fanart=result.get('backdrop'), year=result.get('year'), action='episodios' if contentType == 'tvshow' else 'findvideos',
+                                       url='{}/{}/{}-{}'.format('https://filmigratis.org', contentType, result.get('id'), support.scrapertools.slugify(result.get('title'))),
+                                       contentType=contentType))
     support.tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
     if len(results) >= per_page:
         page += 1
         support.nextPage(itemlist, item, next_page='https://filmigratis.org/category/' + str(item.n) + '/' + item.genre + '?p=' + str(page))
@@ -97,7 +87,7 @@ def search_(item, text=''):
 
 
 def search(item, text):
-    return search_(item, text)
+    return peliculas(item, text)
 
 
 def findvideos(item):