Revert "Remove combined search endpoints."

This reverts commit 30d0d53c7d11a48135c9ec2ee120cffa4f9135f2.