Remove defaults, fix QuerySet rule section