Enhanced the search and rent methods