Fixed sorting, removed async due to bugs