modified queryset usage, reduced DB queries