fixed fix for second context and removed tmp workaround - found another not...

fixed fix for second context and removed tmp workaround - found another not affecting issue, that might become a problem by any change in the calling/requesting/redirecting strategy