Fixing problem with queryset in new version