Search API bug fixes and enhancements

Search API bug fixes and enhancements