Fixed wrong data refresh when form saved