Updated search API to not hit database (bug 851588)