diff --git a/airtime_mvc/application/forms/SmartPlaylistCriteria.php b/airtime_mvc/application/forms/SmartPlaylistCriteria.php
index ab1a79e88..15612b781 100644
--- a/airtime_mvc/application/forms/SmartPlaylistCriteria.php
+++ b/airtime_mvc/application/forms/SmartPlaylistCriteria.php
@@ -58,9 +58,9 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
         );
         
         $limitOptions = array(
-            "hours",
-            "minutes",
-            "items"
+            "hours" => "hours",
+            "minutes" => "minutes",
+            "items" => "items"
         );
 
         $this->setDecorators(array(
@@ -79,23 +79,23 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
         $this->addElement($spType);
         
         $numElements = count($criteriaOptions);
-        for ($i = 1; $i <= $numElements; $i++) {
+        for ($i = 0; $i < $numElements; $i++) {
             $criteria = new Zend_Form_Element_Select('sp_criteria_'.$i);
             $criteria->setAttrib('class', 'input_select');
-            $criteria->setValue(0);
+            $criteria->setValue('Select criteria');
             $criteria->setDecorators(array('viewHelper'));
             $criteria->setMultiOptions($criteriaOptions);
-            if ($i != 1){
+            if ($i != 0){
                 $criteria->setAttrib('disabled', 'disabled');
             }
             $this->addElement($criteria);
             
             $criteriaModifers = new Zend_Form_Element_Select('sp_criteria_modifier_'.$i);
-            $criteriaModifers->setValue(0);
+            $criteriaModifers->setValue('Select modifier');
             $criteriaModifers->setAttrib('class', 'input_select');
             $criteriaModifers->setDecorators(array('viewHelper'));
             $criteriaModifers->setMultiOptions($stringCriteriaOptions);
-            if ($i != 1){
+            if ($i != 0){
                 $criteriaModifers->setAttrib('disabled', 'disabled');
             }
             $this->addElement($criteriaModifers);
@@ -103,7 +103,7 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
             $criteriaValue = new Zend_Form_Element_Text('sp_criteria_value_'.$i);
             $criteriaValue->setAttrib('class', 'input_text');
             $criteriaValue->setDecorators(array('viewHelper'));
-            if ($i != 1){
+            if ($i != 0){
                 $criteriaValue->setAttrib('disabled', 'disabled');
             }
             $this->addElement($criteriaValue);
diff --git a/airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml
index 41576151d..e4a2b6f59 100644
--- a/airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml
+++ b/airtime_mvc/application/views/scripts/form/smart-playlist-criteria.phtml
@@ -17,15 +17,15 @@
         </dd>
         
         <dd id='sp_criteria-element'>
-        <?php for ($i = 1; $i <= $this->criteriasLength; $i++) {?>
-            <div <?php if (($i > 1) && ($this->element->getElement('sp_criteria_'.$i)->getAttrib('disabled') == 'disabled')) {
+        <?php for ($i = 0; $i < $this->criteriasLength; $i++) {?>
+            <div <?php if (($i > 0) && ($this->element->getElement('sp_criteria_'.$i)->getAttrib('disabled') == 'disabled')) {
                            echo 'style=display:none';
                        } ?>>
         
                 <?php echo $this->element->getElement('sp_criteria_'.$i) ?>
                 <?php echo $this->element->getElement('sp_criteria_modifier_'.$i) ?>
                 <?php echo $this->element->getElement('sp_criteria_value_'.$i) ?>
-                <?php if ($i != 1) { ?>
+                <?php if ($i != 0) { ?>
                     <a href='#' id='criteria_remove_<?php echo $i ?>'>Remove</a>
                 <?php } ?>
             </div>
diff --git a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
index 1bcc3686e..33cb4d315 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
@@ -38,8 +38,8 @@ function setSmartPlaylistEvents() {
 		
         list.find('div:visible:last').children().attr('disabled', 'disabled');
         list.find("div:visible:last")
-            .find('[name^="sp_criteria"]').val('').end()
-            .find('[name^="sp_criteria_modifier"]').val('').end()
+            .find('[name^="sp_criteria"]').val(0).end()
+            .find('[name^="sp_criteria_modifier"]').val(0).end()
             .find('[name^="sp_criteria_value"]').val('')
             .end().hide();
 
@@ -83,4 +83,4 @@ function staticCallback() {
 
 function dynamicCallback() {
 	
-}
\ No newline at end of file
+}