Add enabled field, and change logic in templatetags