Updated version after fix of the search