Further tweaking to fix the default site theme search box on certain pages.