more refactor; reworked how authorization return url was managed for partial redirects