Offline mode: Logic fixes (bug 1730)