diff --git a/distfiles/maintformentry.php b/distfiles/maintformentry.php
index a714180..2c9b902 100644
--- a/distfiles/maintformentry.php
+++ b/distfiles/maintformentry.php
@@ -176,10 +176,10 @@ if ($mfadd) {
                     $newmaintformid=mysqli_insert_id($db);
                     $mfidtoprint=$newmaintformid;
 
-                    // add this maintformid to the appropriate flag_tables
-                    foreach ($flags as $flagtblnum) {
-                        $flagtblname="flag_".$flagtblnum;
-                        mysqli_query($db,"insert into $flagtblname(target,id) values(\"maintforms\",\"$newmaintformid\")");
+                    // update the flagmap table
+                    foreach ($flags as $thisflag) {
+                        // set flag for this maintenance form
+                        mysqli_query($db,"insert into flagmap(flagid,maintformid) values(\"$thisflag\",\"$$newmaintformid\")");
                     }
                 }
             }
@@ -209,20 +209,12 @@ if ($mfedit) {
             if (! $pdatamismatch) {
                 mysqli_query($db,"update maintforms set mfdate=\"$mfdate\", mftime=\"$mftime\", mfpart=\"$mfpart\", mfpartloc=\"$mfpartloc\",
                 mfmalfunction=\"$mfmalfunction\", nha=\"$nha\", repord=\"$repord\", lognoteid=\"$lognoteid\", pending=\"$pending\" where maintformid=\"$maintformid\"");
-                // update the appropriate flag_tables
-                $flagids=mysqli_query($db,"select flagid from flags");
-                while ($thisflagid=mysqli_fetch_row($flagids)) {
-                    $thisflag_tbl="flag_".$thisflagid[0];
-                    if ($flags[0]=="") $flags=[];
-                    if (in_array($thisflagid[0],$flags)) {
-                        if(!mysqli_num_rows(mysqli_query($db,"select id from $thisflag_tbl where target=\"maintforms\" and id=\"$maintformid\""))) {
-                            mysqli_query($db,"insert into $thisflag_tbl(target,id) values(\"maintforms\",\"$maintformid\")");
-                        }
-                    } else {
-                        if(mysqli_num_rows(mysqli_query($db,"select id from $thisflag_tbl where target=\"maintforms\" and id=\"$maintformid\""))) {
-                            mysqli_query($db,"delete from $thisflag_tbl where target=\"maintforms\" and id=\"$maintformid\"");
-                        }
-                    }
+                
+                // update the flagmap table
+                mysqli_query($db,"delete from flagmap where maintformid=\"$maintformid\"");
+                foreach ($flags as $thisflag) {
+                    // set flag for this maintenance form
+                    mysqli_query($db,"insert into flagmap(flagid,maintformid) values(\"$thisflag\",\"$$maintformid\")");
                 }
             }
         }
@@ -233,12 +225,8 @@ if ($mfedit) {
 if ($mfdelete && $mfauthorized) {
     // delete from maintforms table
     mysqli_query($db,"delete from maintforms where maintformid=\"$maintformid\"");
-    // delete occurances from the flag_ tables
-    $flagids=mysqli_query($db,"select flagid from flags");
-    while ($thisflagid=mysqli_fetch_row($flagids)) {
-        $delflag_tbl="flag_".$thisflagid[0];
-        mysqli_query($db,"delete from $delflag_tbl where target=\"maintforms\" and id=\"$maintformid\"");
-    }
+    // delete occurances from the flagmap table
+    mysqli_query($db,"delete from flagmap where maintformid=\"$maintformid\"");
 }
 
 if ($actionadd) {
@@ -384,22 +372,33 @@ if ($printfmt) {
     <b><u>Flags</u></b><br>
     <table width=\"100%\" border=\"0\">
     ";
-    // get an array of flagids set for this maintformid
-    $allflags=mysqli_query($db,"select flagid from flags");
-    unset($theseflags);
-    while ($thisflag=mysqli_fetch_row($allflags)) {
-        $thisflagtbl="flag_".$thisflag[0];
-        if (mysqli_num_rows(mysqli_query($db,"select id from $thisflagtbl where target=\"maintforms\" and id=\"$maintformid\""))) {
-            $theseflags[]=$thisflag[0];
-        }
-    }
-    $flagslist=mysqli_query($db,"select * from flags");
-    while ($flagsymbol=mysqli_fetch_assoc($flagslist)) {
-        if ($theseflags[0]=="") $theseflags=[];
-        if (in_array($flagsymbol["flagid"],$theseflags)) {
-            echo $flagsymbol['flagsym']."&nbsp;&nbsp;";
-        }
-    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    // // get an array of flagids set for this maintformid
+    // $allflags=mysqli_query($db,"select flagid from flags");
+    // unset($theseflags);
+    // while ($thisflag=mysqli_fetch_row($allflags)) {
+    //     $thisflagtbl="flag_".$thisflag[0];
+    //     if (mysqli_num_rows(mysqli_query($db,"select id from $thisflagtbl where target=\"maintforms\" and id=\"$maintformid\""))) {
+    //         $theseflags[]=$thisflag[0];
+    //     }
+    // }
+    // $flagslist=mysqli_query($db,"select * from flags");
+    // while ($flagsymbol=mysqli_fetch_assoc($flagslist)) {
+    //     if ($theseflags[0]=="") $theseflags=[];
+    //     if (in_array($flagsymbol["flagid"],$theseflags)) {
+    //         echo $flagsymbol['flagsym']."&nbsp;&nbsp;";
+    //     }
+    // }
     echo "
     </table><hr>
     <b><u>Maintenance Actions</u></b><br>
diff --git a/distfiles/refchain.php b/distfiles/refchain.php
index d871b7e..f13f231 100644
--- a/distfiles/refchain.php
+++ b/distfiles/refchain.php
@@ -70,18 +70,6 @@ while($mptr<count($master)) {
             }
         }
         
-        //$allflagqry=mysqli_query($db,"select flagid from flags");
-        //while ($allflagids=mysqli_fetch_row($allflagqry)) {
-            //$flagid=$allflagids[0];
-            //$flag_tbl="flag_".$flagid;
-            //if (mysqli_num_rows(mysqli_query($db,"select id from $flag_tbl where target=\"lognotes\" and id=\"$noteid\""))) {
-                //$flagparam=mysqli_fetch_assoc(mysqli_query($db,"select * from flags where flagid=\"$flagid\""));
-                //$flagcolor=$flagparam["flagcolor"];
-                //$flagsym=$flagparam["flagsym"];
-                //$flagstring=$flagstring."<font color=\"$flagcolor\">$flagsym</font>&nbsp;&nbsp;";
-            //}
-        //}
-        
         if ($flagstring) $fmtnote=$fmtnote."<br>".$flagstring;
         printf("
         <tr>
diff --git a/distfiles/search.php b/distfiles/search.php
index 3e0ad9f..e3c67a9 100644
--- a/distfiles/search.php
+++ b/distfiles/search.php
@@ -54,7 +54,9 @@ if ($print) {
 
 framework("begin","$logname Search","Search",$print);
 
-//var_dump($_REQUEST);
+// echo "REQUEST variables: <br>";
+// var_dump($_REQUEST);
+
 
 // ******** begin database manipulation ********
 
@@ -199,24 +201,9 @@ if ($search) {
             $logconstraints[]="lognotes.lognoteid=logparts.lognoteid and logparts.partid=parts.partid and maintforms.mfpart=parts.partid and maintforms.repord=\"{$srchrepord}\"";
         }
         // build the clauses and run the query
-        echo "logfromtables: ";
-        foreach ($logfromtables as $lft) {
-            echo "$lft&nbsp;";
-        }
-        echo "<br><br>";
-        
-        echo "logconstraints: ";
-        foreach ($logconstraints as $lc) {
-            echo "$lc&nbsp;";
-        }
-        echo "<br><br>";
-        
         $logfromclause=implode(",",array_unique($logfromtables));
-        echo "logfromclause: $logfromclause <br><br>";
         $logwhereclause=implode(" and ",$logconstraints);
-        echo "logwhereclause: $logwhereclause <br><br>";
         $logrowqry=mysqli_query($db,"select lognotes.* from $logfromclause where $logwhereclause order by lognotes.date asc, lognotes.time asc");
-        echo "select lognotes.* from $logfromclause where $logwhereclause order by lognotes.date asc, lognotes.time asc";
     }
     if ($target[0]=="") $target=[];
     if (in_array("maintform",$target)) {
@@ -268,15 +255,15 @@ if ($search) {
             $mffromtables[]="maintforms";
             $mffromtables[]="flagmap";
             $flagconstraints[]="flagmap.maintformid=maintforms.maintformid and flagmap.flagid in (";
-            foreach ($srchflags as $flagid) {
-                $flagconstraints[]="\"$flagid\"";
+            foreach ($srchflags as $thisflagid) {
+                $flagconstraints[]="\"$thisflagid\"";
                 $flagconstraints[]=",";
             }
             // remove final comma
             array_splice($flagconstraints, -1, 1);
             $flagconstraints[]=") group by flagmap.maintformid having count(distinct flagmap.flagid)=$flagcount";
             // make flagconstraints a single string so that the final implode doesn't split it
-            $logconstraints[]=join('', $flagconstraints);
+            $mfconstraints[]=join('', $flagconstraints);
         }
         // uid
         if ($srchuid != "any" && $srchuid != "") {
@@ -687,9 +674,10 @@ if ($search) {
     if ($target[0]=="") $target=[];
     if (in_array("log",$target)) {
         // run lognotes query and show results
-        if(mysqli_num_rows($logrowqry)) {
+        $log_num_results=mysqli_num_rows($logrowqry);
+        if($log_num_results) {
             echo "
-            <b>Results from Logbook</b><br><br>
+            <b>Results from Logbook: $log_num_results</b><br><br>
             <table border=\"1\" width=\"100%\">
             <tr><th>Note ID</th><th>Date/Time</th><th>Shift</th><th>Tech</th><th>Subject</th><th>Note</th><th>References</th></tr>
             ";
@@ -748,9 +736,10 @@ if ($search) {
     if ($target[0]=="") $target=[];
     if (in_array("maintform",$target)) {
         // run maintforms query and show results
-        if(mysqli_num_rows($mfrowqry)) {
+        $mf_num_results=mysqli_num_rows($mfrowqry);
+        if($mf_num_results) {
             echo "
-            <b>Results from Maintenance Forms</b><br><br>
+            <b>Results from Maintenance Forms: $mf_num_results</b><br><br>
             <br><table border=\"1\" width=\"100%\">
             <tr>
             <th>ID</th>
@@ -811,9 +800,10 @@ if ($search) {
     if ($target[0]=="") $target=[];
     if (in_array("part",$target)) {
         // run parts query and show results
-        if(mysqli_num_rows($prowqry)) {
+        $p_num_results=mysqli_num_rows($prowqry);
+        if($p_num_results) {
             echo "
-            <b>Results from Parts</b><br><br>
+            <b>Results from Parts: $p_num_results</b><br><br>
             <table width=\"100%\" border=\"1\" cellpadding=\"5\">
             <tr>
             <th>Action</th>