Search now uses database