That doesn't seem like there's a need to change the program. It seems like gov should just enforce the existing rules, or make position descriptions more precise. McD position != Chef. Real estate agents shouldn't be on the list if there's no shortage.

Enforcing the current rules and spot checks that would make employers less likely to cheat on descriptions should be enough.