Added stop_sort option to not group results together