re #180 : Improve controller data handling

- Only set the data in the request for 'model' controllers
- Make sure to clear the request data first.