more updates to session instead of local storage

The app was already writing to session in most cases, but fetchData was
reading from local. It checks both session and local now.