Add support for short-cut names for bookmarks