Some random cleanup for search page