Capabilities and Competencies

I understand that competencies are linked to nationally accredited units whereas capabilities are ad-hoc "competencies" of the trainer for non-accredited training.

When adding a class/workshop there are no trainers available if there are none with the required competencies, but currently all trainers are available against our non-accredited training. This is ok for a very small training company and keeps things simple, but I have quite complex non-accredited training with a bunch of trainers and we need to sign off trainers as capable to facilitate the given training. Currently we can add the capabilities to a matrix, but there is no follow through in preventing non-capable trainers to be assigned to the course.

My admin staff should not have to pull up a list to check that a trainer is capable of providing that training before going and searching a list of trainers for them to add to the workshop. 

I have tested idea of using competencies instead, but competencies are locked to only accredited units that can be searched for on training.gov.au. 

Does anyone else have the need to filter their trainers for non-accredited courses to only those who are capable of delivering the training?