Updated the Searchable behavior