diff --git a/rhodecode/lib/dbmigrate/schema/db_1_3_0.py b/rhodecode/lib/dbmigrate/schema/db_1_3_0.py
index 26408ee0..fb294e46 100644
--- a/rhodecode/lib/dbmigrate/schema/db_1_3_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_1_3_0.py
@@ -700,7 +700,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine':'InnoDB',
          'mysql_charset': 'utf8'},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_1_4_0.py b/rhodecode/lib/dbmigrate/schema/db_1_4_0.py
index edf0a444..4b840a48 100644
--- a/rhodecode/lib/dbmigrate/schema/db_1_4_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_1_4_0.py
@@ -339,7 +339,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -514,7 +514,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_1_5_0.py b/rhodecode/lib/dbmigrate/schema/db_1_5_0.py
index 4f790770..abacbbc8 100644
--- a/rhodecode/lib/dbmigrate/schema/db_1_5_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_1_5_0.py
@@ -351,7 +351,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -527,7 +527,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_1_5_2.py b/rhodecode/lib/dbmigrate/schema/db_1_5_2.py
index adb28a8c..2ddceddb 100644
--- a/rhodecode/lib/dbmigrate/schema/db_1_5_2.py
+++ b/rhodecode/lib/dbmigrate/schema/db_1_5_2.py
@@ -351,7 +351,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -382,7 +382,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -544,7 +544,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_1_6_0.py b/rhodecode/lib/dbmigrate/schema/db_1_6_0.py
index 7cdc1bf3..6c5417e3 100644
--- a/rhodecode/lib/dbmigrate/schema/db_1_6_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_1_6_0.py
@@ -352,7 +352,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -383,7 +383,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -628,7 +628,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_1_7_0.py b/rhodecode/lib/dbmigrate/schema/db_1_7_0.py
index f5358a02..ceaf4182 100644
--- a/rhodecode/lib/dbmigrate/schema/db_1_7_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_1_7_0.py
@@ -365,7 +365,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -396,7 +396,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -599,7 +599,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_1_8_0.py b/rhodecode/lib/dbmigrate/schema/db_1_8_0.py
index 2f968bc6..cbfc4022 100644
--- a/rhodecode/lib/dbmigrate/schema/db_1_8_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_1_8_0.py
@@ -367,7 +367,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -398,7 +398,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -601,7 +601,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_2_0_0.py b/rhodecode/lib/dbmigrate/schema/db_2_0_0.py
index a88f8675..d6e7e535 100644
--- a/rhodecode/lib/dbmigrate/schema/db_2_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_2_0_0.py
@@ -387,7 +387,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -418,7 +418,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -624,7 +624,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_2_0_1.py b/rhodecode/lib/dbmigrate/schema/db_2_0_1.py
index f093454c..bfe572f5 100644
--- a/rhodecode/lib/dbmigrate/schema/db_2_0_1.py
+++ b/rhodecode/lib/dbmigrate/schema/db_2_0_1.py
@@ -387,7 +387,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -418,7 +418,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -623,7 +623,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_2_0_2.py b/rhodecode/lib/dbmigrate/schema/db_2_0_2.py
index 52f02b2f..e4186c2d 100644
--- a/rhodecode/lib/dbmigrate/schema/db_2_0_2.py
+++ b/rhodecode/lib/dbmigrate/schema/db_2_0_2.py
@@ -387,7 +387,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -418,7 +418,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -641,7 +641,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_2_1_0.py b/rhodecode/lib/dbmigrate/schema/db_2_1_0.py
index 28e5190b..c86e6e1e 100644
--- a/rhodecode/lib/dbmigrate/schema/db_2_1_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_2_1_0.py
@@ -401,7 +401,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     user_api_key_id = Column("user_api_key_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -421,7 +421,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -452,7 +452,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -658,7 +658,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_2_2_0.py b/rhodecode/lib/dbmigrate/schema/db_2_2_0.py
index f1f381b7..acf87d4f 100644
--- a/rhodecode/lib/dbmigrate/schema/db_2_2_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_2_2_0.py
@@ -408,7 +408,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     user_api_key_id = Column("user_api_key_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -428,7 +428,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -459,7 +459,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -674,7 +674,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_2_2_3.py b/rhodecode/lib/dbmigrate/schema/db_2_2_3.py
index 32e4f8dd..452aa981 100644
--- a/rhodecode/lib/dbmigrate/schema/db_2_2_3.py
+++ b/rhodecode/lib/dbmigrate/schema/db_2_2_3.py
@@ -408,7 +408,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     user_api_key_id = Column("user_api_key_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -428,7 +428,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -459,7 +459,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -677,7 +677,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py b/rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py
index d8f93d06..08e97f2f 100644
--- a/rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py
@@ -406,7 +406,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -434,7 +434,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -465,7 +465,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -681,7 +681,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py b/rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py
index 97b87ca6..491f4d5b 100644
--- a/rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py
+++ b/rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py
@@ -406,7 +406,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -434,7 +434,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -465,7 +465,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -681,7 +681,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py b/rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py
index 38305819..6e753968 100644
--- a/rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py
+++ b/rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py
@@ -425,7 +425,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -454,7 +454,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -485,7 +485,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -709,7 +709,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py b/rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py
index b451ec0e..c3f5ae8f 100644
--- a/rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py
@@ -435,7 +435,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -464,7 +464,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -495,7 +495,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -719,7 +719,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py b/rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py
index e27929ff..d154e93d 100644
--- a/rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py
+++ b/rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py
@@ -476,7 +476,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -505,7 +505,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -536,7 +536,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -760,7 +760,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py b/rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py
index 4332177e..6f55bae2 100644
--- a/rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py
@@ -476,7 +476,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -505,7 +505,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -536,7 +536,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -760,7 +760,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py b/rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py
index 14bda992..a269ad84 100644
--- a/rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py
+++ b/rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py
@@ -477,7 +477,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -506,7 +506,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -537,7 +537,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -761,7 +761,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py b/rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py
index 56380540..3ba394a8 100644
--- a/rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py
@@ -477,7 +477,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -506,7 +506,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -537,7 +537,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -761,7 +761,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py b/rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py
index 26d7d482..20aba0e7 100644
--- a/rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py
@@ -483,7 +483,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -512,7 +512,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -543,7 +543,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -767,7 +767,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py b/rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py
index 817ab716..4ae958fd 100644
--- a/rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py
@@ -600,7 +600,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -629,7 +629,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -660,7 +660,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -889,7 +889,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py b/rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py
index 977f711f..066955b5 100644
--- a/rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py
@@ -623,7 +623,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -652,7 +652,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -683,7 +683,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -914,7 +914,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     group_name = Column("group_name", String(255), nullable=False, unique=True, default=None)
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py
index ae166e0e..77ff7e00 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py
@@ -1031,7 +1031,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -1134,7 +1134,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1165,7 +1165,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1205,7 +1205,7 @@ class UserSshKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
@@ -2296,7 +2296,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py
index ca07be17..c04c917b 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py
@@ -1035,7 +1035,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -1138,7 +1138,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1169,7 +1169,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1209,7 +1209,7 @@ class UserSshKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
@@ -2362,7 +2362,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py
index 8b6a92b5..a4c348a4 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py
@@ -1046,7 +1046,7 @@ class UserApiKeys(Base, BaseModel):
         Index('uak_api_key_expires_idx', 'api_key', 'expires'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -1148,7 +1148,7 @@ class UserEmailMap(Base, BaseModel):
         UniqueConstraint('email'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1178,7 +1178,7 @@ class UserIpMap(Base, BaseModel):
         UniqueConstraint('user_id', 'ip_addr'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1217,7 +1217,7 @@ class UserSshKeys(Base, BaseModel):
 
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
@@ -2436,7 +2436,7 @@ class RepoGroup(Base, BaseModel):
         UniqueConstraint('group_name', 'group_parent_id'),
         base_table_args,
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py b/rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py
index fb18fd9e..caae6318 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py
@@ -1048,7 +1048,7 @@ class UserApiKeys(Base, BaseModel):
         Index('uak_api_key_expires_idx', 'api_key', 'expires'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -1150,7 +1150,7 @@ class UserEmailMap(Base, BaseModel):
         UniqueConstraint('email'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1180,7 +1180,7 @@ class UserIpMap(Base, BaseModel):
         UniqueConstraint('user_id', 'ip_addr'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1219,7 +1219,7 @@ class UserSshKeys(Base, BaseModel):
 
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
@@ -2459,7 +2459,7 @@ class RepoGroup(Base, BaseModel):
         UniqueConstraint('group_name', 'group_parent_id'),
         base_table_args,
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py b/rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py
index 07408b55..25361fe3 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py
@@ -1048,7 +1048,7 @@ class UserApiKeys(Base, BaseModel):
         Index('uak_api_key_expires_idx', 'api_key', 'expires'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -1150,7 +1150,7 @@ class UserEmailMap(Base, BaseModel):
         UniqueConstraint('email'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1180,7 +1180,7 @@ class UserIpMap(Base, BaseModel):
         UniqueConstraint('user_id', 'ip_addr'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1219,7 +1219,7 @@ class UserSshKeys(Base, BaseModel):
 
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
@@ -2459,7 +2459,7 @@ class RepoGroup(Base, BaseModel):
         UniqueConstraint('group_name', 'group_parent_id'),
         base_table_args,
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py b/rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py
index 7cc8ef61..6449b34b 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py
@@ -1065,7 +1065,7 @@ class UserApiKeys(Base, BaseModel):
         Index('uak_api_key_expires_idx', 'api_key', 'expires'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -1167,7 +1167,7 @@ class UserEmailMap(Base, BaseModel):
         UniqueConstraint('email'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1197,7 +1197,7 @@ class UserIpMap(Base, BaseModel):
         UniqueConstraint('user_id', 'ip_addr'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1236,7 +1236,7 @@ class UserSshKeys(Base, BaseModel):
 
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
@@ -2530,7 +2530,7 @@ class RepoGroup(Base, BaseModel):
         UniqueConstraint('group_name', 'group_parent_id'),
         base_table_args,
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py
index 73204f44..f57804c9 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py
@@ -1116,7 +1116,7 @@ class UserApiKeys(Base, BaseModel):
         Index('uak_api_key_expires_idx', 'api_key', 'expires'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -1220,7 +1220,7 @@ class UserEmailMap(Base, BaseModel):
         UniqueConstraint('email'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1250,7 +1250,7 @@ class UserIpMap(Base, BaseModel):
         UniqueConstraint('user_id', 'ip_addr'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1289,7 +1289,7 @@ class UserSshKeys(Base, BaseModel):
 
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
@@ -2615,7 +2615,7 @@ class RepoGroup(Base, BaseModel):
         UniqueConstraint('group_name', 'group_parent_id'),
         base_table_args,
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py b/rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py
index 1cf1ee62..67cd7eea 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py
@@ -1122,7 +1122,7 @@ class UserApiKeys(Base, BaseModel):
         Index('uak_api_key_expires_idx', 'api_key', 'expires'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -1226,7 +1226,7 @@ class UserEmailMap(Base, BaseModel):
         UniqueConstraint('email'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1256,7 +1256,7 @@ class UserIpMap(Base, BaseModel):
         UniqueConstraint('user_id', 'ip_addr'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1295,7 +1295,7 @@ class UserSshKeys(Base, BaseModel):
 
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
@@ -2621,7 +2621,7 @@ class RepoGroup(Base, BaseModel):
         UniqueConstraint('group_name', 'group_parent_id'),
         base_table_args,
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py
index 94861c02..6adc3afe 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_20_0_0.py
@@ -1127,7 +1127,7 @@ class UserApiKeys(Base, BaseModel):
         Index('uak_api_key_expires_idx', 'api_key', 'expires'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -1249,7 +1249,7 @@ class UserEmailMap(Base, BaseModel):
         UniqueConstraint('email'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1279,7 +1279,7 @@ class UserIpMap(Base, BaseModel):
         UniqueConstraint('user_id', 'ip_addr'),
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1318,7 +1318,7 @@ class UserSshKeys(Base, BaseModel):
 
         base_table_args
     )
-    __mapper_args__ = {}
+    
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
@@ -2652,7 +2652,7 @@ class RepoGroup(Base, BaseModel):
         UniqueConstraint('group_name', 'group_parent_id'),
         base_table_args,
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py
index c0d45c15..0b6170bb 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py
@@ -882,7 +882,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -931,7 +931,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -962,7 +962,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -2008,7 +2008,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py
index c72993e1..6023ec99 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py
@@ -883,7 +883,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -932,7 +932,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -963,7 +963,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -2000,7 +2000,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py b/rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py
index 42d9184f..ef8b1dac 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py
@@ -882,7 +882,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -931,7 +931,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -962,7 +962,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1999,7 +1999,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py b/rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py
index 283abdda..26cfc828 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py
@@ -884,7 +884,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -933,7 +933,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -964,7 +964,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -2001,7 +2001,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py
index 748e963f..69220708 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py
@@ -884,7 +884,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -933,7 +933,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -964,7 +964,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -2001,7 +2001,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py
index f78878e6..db0c6faa 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py
@@ -927,7 +927,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -976,7 +976,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1007,7 +1007,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -2044,7 +2044,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py b/rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py
index 84c9df00..cd73c370 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py
@@ -928,7 +928,7 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -977,7 +977,7 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1008,7 +1008,7 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -2045,7 +2045,7 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
+    
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py b/rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py
index 122e2854..606985b8 100644
--- a/rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py
+++ b/rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py
@@ -978,7 +978,6 @@ class UserApiKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -1081,7 +1080,6 @@ class UserEmailMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1112,7 +1110,6 @@ class UserIpMap(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1151,7 +1148,7 @@ class UserSshKeys(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True}
     )
-    __mapper_args__ = {}
+    
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
@@ -2232,7 +2229,6 @@ class RepoGroup(Base, BaseModel):
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
     )
-    __mapper_args__ = {'order_by': 'group_name'}
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups
 
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 53951368..a762b99d 100644
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -1161,7 +1161,6 @@ class UserApiKeys(Base, BaseModel):
         Index('uak_api_key_expires_idx', 'api_key', 'expires'),
         base_table_args
     )
-    __mapper_args__ = {}
 
     # ApiKey role
     ROLE_ALL = 'token_role_all'
@@ -1284,7 +1283,6 @@ class UserEmailMap(Base, BaseModel):
         UniqueConstraint('email'),
         base_table_args
     )
-    __mapper_args__ = {}
 
     email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1314,7 +1312,6 @@ class UserIpMap(Base, BaseModel):
         UniqueConstraint('user_id', 'ip_addr'),
         base_table_args
     )
-    __mapper_args__ = {}
 
     ip_id = Column("ip_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
@@ -1352,7 +1349,6 @@ class UserSshKeys(Base, BaseModel):
 
         base_table_args
     )
-    __mapper_args__ = {}
 
     ssh_key_id = Column('ssh_key_id', Integer(), nullable=False, unique=True, default=None, primary_key=True)
     ssh_key_data = Column('ssh_key_data', String(10240), nullable=False, unique=None, default=None)
@@ -2684,10 +2680,6 @@ class RepoGroup(Base, BaseModel):
         UniqueConstraint('group_name', 'group_parent_id'),
         base_table_args,
     )
-    __mapper_args__ = {
-        #TODO: this is now depracated ?!
-        # 'order_by': 'group_name'
-    }
 
     CHOICES_SEPARATOR = '/'  # used to generate select2 choices for nested groups