Fix count in 'search' query
Merge branch 'public/7.9' into public/feature/extended-browse-modes