bug fixes related to refreshing folders' counts
refactoring - move bookmarkShufle to hold a reference to current bookmarkStore