Moved bookmarks to server side and fixed search.