Fixed adapter and added actual sorts