diff --git a/web/includes/actions.php b/web/includes/actions.php
index 633ccc015..016de090c 100644
--- a/web/includes/actions.php
+++ b/web/includes/actions.php
@@ -128,24 +128,16 @@ if ( !empty($action) ) {
             dbQuery( 'DELETE FROM Filters WHERE Id=?', array( $_REQUEST['Id'] ) );
           }
         } else if ( ( $action == 'save' ) or ( $action == 'execute' ) or ( $action == 'submit' ) ) {
-    
-          $sql = '';
-          $endSql = '';
-          if ( $action == 'execute' or $action == 'submit' ) {
-            # Replace will teplace any filter with the same Id 
-            # Since we aren't specifying the Id , this is effectively an insert
-            $sql = 'REPLACE INTO Filters SET Name = \'_TempFilter'.time().'\',';
-          } else if ( $_REQUEST['Id'] ) {
-            $sql = 'UPDATE Filters SET';
-            $endSql = ' WHERE Id = '.$_REQUEST['Id'];
-          } else {
-            $sql = 'INSERT INTO Filters SET';
-          }
 
+          $sql = '';
           $_REQUEST['filter']['sort_field'] = validStr($_REQUEST['filter']['sort_field']);
           $_REQUEST['filter']['sort_asc'] = validStr($_REQUEST['filter']['sort_asc']);
           $_REQUEST['filter']['limit'] = validInt($_REQUEST['filter']['limit']);
-          $sql .= ' Name = '.dbEscape($_REQUEST['filter']['Name']);
+          if ( $action == 'execute' or $action == 'submit' ) {
+            $sql .= ' Name = \'_TempFilter'.time().'\'';
+          } else {
+            $sql .= ' Name = '.dbEscape($_REQUEST['filter']['Name']);
+          }
           $sql .= ', Query = '.dbEscape(jsonEncode($_REQUEST['filter']['terms']));
           $sql .= ', AutoArchive = '.(!empty($_REQUEST['filter']['AutoArchive']) ? 1 : 0);
           $sql .= ', AutoVideo = '. ( !empty($_REQUEST['filter']['AutoVideo']) ? 1 : 0);
@@ -158,8 +150,10 @@ if ( !empty($action) ) {
           $sql .= ', Background = '. ( !empty($_REQUEST['filter']['Background']) ? 1 : 0);
           $sql .= ', Concurrent  = '. ( !empty($_REQUEST['filter']['Concurrent']) ? 1 : 0);
 
-          dbQuery( $sql. $endSql );
-          if ( ! $_REQUEST['Id'] ) {
+          if ( $_REQUEST['Id'] ) {
+            dbQuery( 'UPDATE Filters SET ' . $sql. ' WHERE Id=?', array($_REQUEST['Id']) );
+          } else {
+            dbQuery( 'INSERT INTO Filters SET' . $sql );
             $_REQUEST['Id'] = dbInsertId();
           }
 
diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index c8c21321a..b73594243 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -155,7 +155,7 @@ if ( (null !== $filter->Concurrent()) and $filter->Concurrent() )
 ?>
         </div>
       </form>
-      <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
+      <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>?view=filter">
         <input type="hidden" name="Id" value="<?php echo $filter->Id() ?>"/>
         <input type="hidden" name="action" value=""/>
         <input type="hidden" name="line" value=""/>
@@ -196,7 +196,7 @@ for ( $i = 0; $i < count($terms); $i++ ) {
   }
 ?>
               <td><?php if ( count($terms) > 2 ) { echo htmlSelect( "filter[terms][$i][obr]", $obracketTypes, $term['obr'] ); } else { ?>&nbsp;<?php } ?></td>
-              <td><?php echo htmlSelect( "filter[terms][$i][attr]", $attrTypes, $term['attr'], "clearValue( this, $i ); submitToFilter( this, 0 );" ); ?></td>
+              <td><?php echo htmlSelect( "filter[terms][$i][attr]", $attrTypes, $term['attr'], "clearValue( this, $i ); this.form.submit();" ); ?></td>
 <?php
   if ( isset($term['attr']) ) {
     if ( $term['attr'] == 'Archived' ) {