bug fixes in offline feature