Bobo browser bug fix and refactor