Move sorting to the collection
Make thumbnails get created on newly instantiated SiteModels