More search js tweaks 798