Minor tweaks and additions, mainly for visual search