fixed sorting by entry order