separated solr included objects and collections; support for SolR deletion before update in case of id change