HR 358 contains amendments to 18 USC 926 aka FOPA.
The bill adds:
"staying in temporary lodging overnight, stopping for food, fuel, vehicle maintenance, an emergency, medical treatment, and any other activity incidental to the transport"
And
"When a person successfully asserts this section as a defense in a criminal proceeding, the court shall award the prevailing defendant a reasonable attorney’s fee."
Currently in House Committtee on the Judiciary.