Fix v2 search

Merging v2 search fix into master.