Cleaned up checkbox
Cleaned up 'select' and 'templateselect' fields.