Fixed subrequest handling
Added http_scheme handler that was taken out by mistake