updates for back button for issue #913