Refresh at the right time

In a few cases where we should not refresh, stop doing so.
In a few cases where we should refresh, start doing so.