Additional fix to document visibility issue - refs BT#7128 and refs BT#7140