improved collection_store set (existing collection case), cleaned up model_store set