Local keyword search reimplemented