Change filter-merge steps to use map of label to an iterable

Also

 - change product to resource
 - add vendor to origin