Change database ordering to 'name', 'databaseinfra'