Working on keyword search feature