extend the fix to both edit and view requests