Improve bookmarklet generator