Fix loading in session and updating language