fixed sort order
fixed next/prev switch