modify handling of the controller mixin

Use selection namespace and controller for mixin instead of separate
mixin