Improved regex for bookmarks creation