Improved do-bookmark command