Bug in client search index update.
(cherry picked from commit c5df41977772b47b3480828bd1680a2a53575b1c)