bookmarks can now be entered without http:// and uncat is shifted to the end of collections
merged conflicts