Changed some default sorting behaviors