Minor tweaks for searching