Fixed bugs for keyword search