Changes to correct bug translation in bookmark form when javascript replacement

New code in bookmark form is not "DRY" at the moment.