Remove server-side bookmarks
Add new eric format and fix SQL