A bit of cleanup and show search terms