Merge the latests changes

Please enter the commit message for your changes. Lines starting
Fix the limit of results found by the query