Index: /tags/ipp-20170121/pstamp/scripts/dqueryparse.pl
===================================================================
--- /tags/ipp-20170121/pstamp/scripts/dqueryparse.pl	(revision 42044)
+++ /tags/ipp-20170121/pstamp/scripts/dqueryparse.pl	(revision 42045)
@@ -385,4 +385,5 @@
                     ($query{$fpa_id}{STATE}[$valid_index] eq 'drop') or 
                     ($query{$fpa_id}{STATE}[$valid_index] eq 'error_cleaned') or 
+		    ($query{$fpa_id}{DATA_STATE}[$valid_index] eq 'error_cleaned') or
                     ($query{$fpa_id}{STATE}[$valid_index] eq 'goto_scrubbed') or 
                     ($query{$fpa_id}{DATA_STATE}[$valid_index] eq 'scrubbed')) {
@@ -390,4 +391,7 @@
                     # image is gone and it's not coming back
                     $query{$fpa_id}{FAULT}[$valid_index] = $PSTAMP_GONE;
+		    ## MEH why was this missing? should be added to other FAULT cases...
+		    ## messes with row order, skipping the faulted rows on output, unclear if problem since happens in other cases too 
+		    $query{$fpa_id}{BAD_COMPONENT}[$valid_index] = 1;
                 }
                 elsif ($need_magic and ($query{$fpa_id}{MAGICKED}[$valid_index] eq 0)) {
@@ -444,4 +448,5 @@
             my $stage_id = $query{$fpa_id}{STAGE_ID}[$i];
             my $component = $query{$fpa_id}{COMPONENT_ID}[$i];
+            my $imagedb = $query{$fpa_id}{IMAGE_DB}[$i];
             print "Need to UPDATE $stage $stage_id $component from $data_state\n";
             $dep_id = queue_update_run($req_id, $outdir, $label, $data_state, $stage, $stage_id, $component, 0, $imagedb);