Search now uses keywords properly.