Form builder refresh issue fix