Keyword search fixed