offlinemode improvements