diff --git a/postfixparser/webui.py b/postfixparser/webui.py
index 04b551b..9755d0b 100644
--- a/postfixparser/webui.py
+++ b/postfixparser/webui.py
@@ -39,6 +39,8 @@
 RqlQuery = rethinkdb.query.ast.RqlQuery
 QueryOrTable = Union[Table, RqlQuery]
 
+skip_keys = ['limit', 'offset', 'page']
+
 
 @app.route('/', methods=['GET'])
 async def index():
@@ -157,7 +159,7 @@ async def api_emails():
     _sm = await _process_filters(query=_sm, frm=frm)
 
     _sm, res = await _paginate_query(_sm, frm, rt_conn=conn, rt_query=r_q, order_by=order_by, order_dir=order_dir)
-    _sm = await _sm.run(conn)
+    _sm = await _sm.run(conn, array_limit=10000000)
 
     sm = []
     if type(_sm) is list:
@@ -197,16 +199,18 @@ async def _paginate_query(query: QueryOrTable, frm: Mapping, rt_conn: DefaultCon
     # if order_by in dict(settings.rethink_tables)['sent_mail']:
     #     _sm = _sm.order_by(index=r_order)
     # else:
-    query = query.order_by(r_order).skip(offset).limit(limit)
+    if empty(frm.keys() - skip_keys, itr=True):
+        query = query.order_by(index=r_order)
+    else:
+        query = query.order_by(r_order)
+    query = query.skip(offset).limit(limit)
     return query, res
 
 
-async def _process_filters(query: QueryOrTable, frm: Mapping, skip_keys: List[str] = None) -> QueryOrTable:
+async def _process_filters(query: QueryOrTable, frm: Mapping) -> QueryOrTable:
     if empty(frm, itr=True):
         return query
     
-    skip_keys = ['limit', 'offset', 'page'] if not skip_keys else skip_keys
-    
     for fkey, fval in frm.items():
         if fkey in skip_keys:
             continue