Summary:Support/New search features

Now requires 38395 to make feature usable.