Add schema validation for collection parameters

Following #665 

Add a schema validation to ensure collect params are correctly suffixed with a mechanism.

Also fix a handful of instances that were missed before.