some cleanup and search page adjustments