Working on Offline mode: added capability to show previous data even in offline