Advanced search cleanup and fix for bigger fonts.