Updates to search api;
Merge