Make dispatcher robust

Some refactoring of dispatcher look-up.
Purely string only keys are better to use