bug : Fix dispatcher

Strip out named matches using keys
Add collaborator callback on select