Improved reliability of session values

These are now triggered for each request, preventing missing values