Implemented basic keyword search (to be improved)