Convert remaining JSP link generation to JSPHelper.
Stop double encoding search terms. Fixes #6902.