I haven't considered the search functionality. Will revise my PR.