Change sorting from order to find all and then order