Adding more checking for redirects where baseurl doesn't get caught properly