minor update for handling return on page load call