Merge "Fix search non-indexable update"