diff --git a/covas_mobile/lib/pages/ListItemByOrganizers.dart b/covas_mobile/lib/pages/ListItemByOrganizers.dart
index b642120..86ade76 100644
--- a/covas_mobile/lib/pages/ListItemByOrganizers.dart
+++ b/covas_mobile/lib/pages/ListItemByOrganizers.dart
@@ -54,23 +54,12 @@ class _MyHomePageState extends State<ListItemOrganizers> {
     });
   }
 
-  void _decrementFetchCount() {
-    setState(() {
-      if (_fetchCount > 0) {
-        _fetchCount--;
-      }
-    });
-  }
-
   void _scrollListener() {
     if (_scrollController.position.pixels ==
         _scrollController.position.maxScrollExtent) {
       _incrementFetchCount();
-    } else if (_scrollController.position.pixels ==
-        _scrollController.position.minScrollExtent) {
-      _decrementFetchCount();
+      _fetchData();
     }
-    _fetchData();
   }
 
   Future<void> _fetchData() async {
@@ -97,8 +86,9 @@ class _MyHomePageState extends State<ListItemOrganizers> {
     final List<Events> body = [];
     if (accessToken.isNotEmpty) {
       DateTime currentDatetime = DateTime.now();
+      num limit = 20 * (count + 1);
       var url = Uri.parse(
-          "${globals.api}/events?organizers=${organizer}&skip=${count}&current_datetime=${currentDatetime.toString()}");
+          "${globals.api}/events?organizers=${organizer}&limit=${limit}&current_datetime=${currentDatetime.toString()}");
       final response = await http.get(url, headers: {
         "Content-Type": "application/json",
         HttpHeaders.cookieHeader: "access_token=${accessToken}"
diff --git a/covas_mobile/lib/pages/ListItemByTags.dart b/covas_mobile/lib/pages/ListItemByTags.dart
index dda75a4..475b4ed 100644
--- a/covas_mobile/lib/pages/ListItemByTags.dart
+++ b/covas_mobile/lib/pages/ListItemByTags.dart
@@ -56,23 +56,13 @@ class _MyHomePageState extends State<ListItemTags> {
     });
   }
 
-  void _decrementFetchCount() {
-    setState(() {
-      if (_fetchCount > 0) {
-        _fetchCount--;
-      }
-    });
-  }
-
   void _scrollListener() {
     if (_scrollController.position.pixels ==
         _scrollController.position.maxScrollExtent) {
       _incrementFetchCount();
-    } else if (_scrollController.position.pixels ==
-        _scrollController.position.minScrollExtent) {
-      _decrementFetchCount();
+
+      _fetchData();
     }
-    _fetchData();
   }
 
   Future<void> _fetchData() async {
@@ -97,8 +87,10 @@ class _MyHomePageState extends State<ListItemTags> {
     final List<Events> body = [];
     if (accessToken.isNotEmpty) {
       DateTime currentDatetime = DateTime.now();
+      num limit = 20 * (count + 1);
+
       var url = Uri.parse(
-          "${globals.api}/events?tags=${tags}&skip=${count}&current_datetime=${currentDatetime.toString()}");
+          "${globals.api}/events?tags=${tags}&limit=${limit}&current_datetime=${currentDatetime.toString()}");
       final response = await http.get(url, headers: {
         "Content-Type": "application/json",
         HttpHeaders.cookieHeader: "access_token=${accessToken}"