Search - revise resultLinksHTML for easier reading/maintenance.
Search - merge changes in bp_search.js