FIX: Search only suppliers

Merged Santiago Said requested to merge fixSupplierMatching into 11.0-stage

Merge request reports