Moved more into sorted adapter for single view support