sorting and workflow improvements