BUG-197: improve session ID tracking