some improvements to the refreshing logic (ECLIPSE-970)