Improved loading of session data
Fix encounter view