141110_Fix refresh issues