Merge "Continue to use search.html for site searching"