Markup for CPR/CO and Cost Plus have Resource selection

Currently for CPR/CO markups it applies the same markup across all resources. This becomes problematic when you have an agreed labour rate so you don't want any markup on labour so you have to recalculate the markup yourself. Could Resource selection be added similar to how the Estimate global markup works.

Then there is basically a similar issue for Cost plus markup where at least that does have resource selection. But say you had agreed Labour and Equipment Rates so only wanted to markup on Materials, Subcontract and Other resource. You then need to add 3 separate markups which then presents 3 markup items on and invoice where you only require one. Same as CPR/CO could resource selection like Estimate global markup be added?