Bugs 3065 and 3076 solved. More flexibility with regards to refresh function.