more fixes for refreshing