More fixes for BookmarksManager and initial work on trash support