Revert breaking changes to search API