=== yfksubs.pl
==================================================================
--- yfksubs.pl	(revision 10078)
+++ yfksubs.pl	(revision 10079)
@@ -1388,11 +1388,29 @@
 			addstr($wi[7],0,0,$nm);
 			refresh($wi[7]);
 
+			my $remarks = "";
+
 			# remarks
+
+			# class
 			if (defined($result->{'operator_class'})) {
-				my $opclass = "Cl: $result->{'operator_class'}";
-				${$_[0]}[12] = $opclass;
-				addstr($wi[12],0,0,$opclass);
+				$remarks .= "Cl: $result->{'operator_class'}";
+			}
+
+			# GRID
+			if (defined($result->{'Grid'})) {
+				$remarks .= " GRID:$result->{'Grid'}";
+			}
+
+			if (defined($result->{'State'})) {
+				$remarks .= " STATE:$result->{'State'}";
+			} elsif ($result->{'Addr2'} =~ /[^,],\s*([^,]+)/) {
+				$remarks .= " STATE:$1";
+			}
+
+			if ($remarks ne '') {
+				${$_[0]}[12] = $remarks;
+				addstr($wi[12],0,0,$remarks);
 				refresh($wi[12]);
 			}
 		}