Working on keyword search functionality