Fix build config merge conflict bug
Search: Fix bug where infinite scroll queries were not escaped
Search: teardown filter for search is not plural