Fix search issue with limit of the results