A few places that also needed linked aspects removed
Added default sorting to all named entities