Fix sub requests

Where in particular?