Combined Pick List for BOM

We want to use BOM Assemblies for bundling products on our retail channels but at the moment the way we pick large number of retail orders is by using the Combined Pick List template. This template does not support the pick locations for BOM components.
I cant find any other acceptable solution to carry out this task within Cin7 when we have 600+ orders to do containing BOM items.