Some more tweaks to the Search & Reset buttons