Started to update the search of entity