Fixed issues with refresh operation.