some minor changes. more important: 50% refactoring bookmarksController and service