Backport SearchDAO enhancements to master