Fixed sorting on serve command