Minor tweaks to Ag search