Merge "Fix search after upgrade" into nyc-dev