[master] Fix exceptions seen in production
BEGINRELEASENOTES
*Bookkeeping FIX: Partially fix browsing with "advanced" mode on
ENDRELEASENOTES
Edited by Chris Burr
BEGINRELEASENOTES
*Bookkeeping FIX: Partially fix browsing with "advanced" mode on
ENDRELEASENOTES