Restore support for use_controller and fix..

..problems with requests that don't have an active scope