Added trace logs to BookmarksController. Some code cleanup.