Card #26 fixes for document show