controller: fix handling of optional tasks
Merge branch 'master' of github.com:hawken93/maps-arcade