fixes for book export
fixes for book export, part 2