case 3725 - Find it here button fix.
Merge branch 'case-3725' into new-search