Minor fixes for keyword search