[Update] Added key listeners to search for usability