fix subrequest handling