[TASK] Bugfixes and cleaning of switchableControllerActions functionality

Please don't merge yet as there's more to come. This thing is not really working atm and needs more love.