Add indexes
Override multi_criteria_filter for sample collection data criteria
Update data instead of deleting and adding
Fix specs