Bookmark search query for names added, bookmark name links fixed, noteservice and bookmarkcontroller optimized
merged connflicts