added keyword search. bug fixes