Fixed parsing with redirects