fixing beforecasting From State field

Merge and take a look