queryset refactoring and js mixins added