fixed keyword search