[FIXUP] Some small fixes for visual search