FIX:(#497)(#475)(#498)(#495)(#490)(#482)(#491) Improvement to Refresh function (ajw107)