PLD: refactor queryset creation