Remove repeated queryset filter
Add missing items call on some dict iteration.