Sort order partially implemented