Fix refresh fields

ticket 656