Added limit to queries, removed limit from task