Various bookmark folders-related improvements