Rental querying now separated in two methods